From f24586cb267dd0ad3fc5ade19cd3462ff7dedb16 Mon Sep 17 00:00:00 2001 From: Brophy <123881+Brophy@users.noreply.github.com> Date: Fri, 24 Apr 2026 11:17:41 +0100 Subject: [PATCH 1/3] fix: correct spelling mistakes in identifiers and strings --- Client/game_sa/CAnimBlendStaticAssociationSA.h | 4 ++-- Client/mods/deathmatch/logic/CIFPEngine.cpp | 4 ++-- Client/multiplayer_sa/CMultiplayerSA_FixBadAnimId.cpp | 4 ++-- Client/sdk/game/CAnimBlendStaticAssociation.h | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Client/game_sa/CAnimBlendStaticAssociationSA.h b/Client/game_sa/CAnimBlendStaticAssociationSA.h index 1d7939e7528..670ababe249 100644 --- a/Client/game_sa/CAnimBlendStaticAssociationSA.h +++ b/Client/game_sa/CAnimBlendStaticAssociationSA.h @@ -30,7 +30,7 @@ class CAnimBlendStaticAssociationSAInterface short sAnimGroup; short sFlags; int* pAnimBlendNodesSequenceArray; - CAnimBlendHierarchySAInterface* pAnimHeirarchy; + CAnimBlendHierarchySAInterface* pAnimHierarchy; }; class CAnimBlendStaticAssociationSA : public CAnimBlendStaticAssociation @@ -47,7 +47,7 @@ class CAnimBlendStaticAssociationSA : public CAnimBlendStaticAssociation short GetAnimID() { return m_pInterface->sAnimID; } short GetAnimGroup() { return m_pInterface->sAnimGroup; } short GetFlags() { return m_pInterface->sFlags; } - CAnimBlendHierarchySAInterface* GetAnimHierachyInterface() { return m_pInterface->pAnimHeirarchy; } + CAnimBlendHierarchySAInterface* GetAnimHierarchyInterface() { return m_pInterface->pAnimHierarchy; } CAnimBlendStaticAssociationSAInterface* GetInterface() { return m_pInterface; } protected: diff --git a/Client/mods/deathmatch/logic/CIFPEngine.cpp b/Client/mods/deathmatch/logic/CIFPEngine.cpp index 2a5f0a04d53..5f704fcb052 100644 --- a/Client/mods/deathmatch/logic/CIFPEngine.cpp +++ b/Client/mods/deathmatch/logic/CIFPEngine.cpp @@ -120,8 +120,8 @@ bool CIFPEngine::EngineApplyAnimation(CClientPed& Ped, CAnimBlendHierarchySAInte if (pCurrentAnimAssociation) { auto pCurrentAnimHierarchy = pCurrentAnimAssociation->GetAnimHierarchy(); - auto pAssocHierachyInterface = pCurrentAnimHierarchy->GetInterface(); - if (pAssocHierachyInterface == pAnimHierarchyInterface) + auto pAssocHierarchyInterface = pCurrentAnimHierarchy->GetInterface(); + if (pAssocHierarchyInterface == pAnimHierarchyInterface) { return true; } diff --git a/Client/multiplayer_sa/CMultiplayerSA_FixBadAnimId.cpp b/Client/multiplayer_sa/CMultiplayerSA_FixBadAnimId.cpp index 2659691761c..ba1672089b8 100644 --- a/Client/multiplayer_sa/CMultiplayerSA_FixBadAnimId.cpp +++ b/Client/multiplayer_sa/CMultiplayerSA_FixBadAnimId.cpp @@ -50,14 +50,14 @@ eAnimID _cdecl OnCAnimBlendAssocGroupCopyAnimation_FixBadAnim(eAnimGroup* pAnimG if (pGroup->pAssociationsArray) { CAnimBlendStaticAssociationSAInterface* pAssociation = pGroup->pAssociationsArray + iUseAnimId; - if (pAssociation && pAssociation->pAnimHeirarchy == NULL) + if (pAssociation && pAssociation->pAnimHierarchy == NULL) { // Choose another animId int iNewAnimId = iUseAnimId; for (int i = 0; i < pGroup->iNumAnimations; i++) { pAssociation = pGroup->pAssociationsArray + i; - if (pAssociation->pAnimHeirarchy) + if (pAssociation->pAnimHierarchy) { // Find closest valid anim id if (abs(iUseAnimId - i) < abs(iUseAnimId - iNewAnimId) || iNewAnimId == iUseAnimId) diff --git a/Client/sdk/game/CAnimBlendStaticAssociation.h b/Client/sdk/game/CAnimBlendStaticAssociation.h index e40af53bfdd..d5aac434957 100644 --- a/Client/sdk/game/CAnimBlendStaticAssociation.h +++ b/Client/sdk/game/CAnimBlendStaticAssociation.h @@ -28,6 +28,6 @@ class CAnimBlendStaticAssociation virtual short GetAnimID() = 0; virtual short GetAnimGroup() = 0; virtual short GetFlags() = 0; - virtual CAnimBlendHierarchySAInterface* GetAnimHierachyInterface() = 0; + virtual CAnimBlendHierarchySAInterface* GetAnimHierarchyInterface() = 0; virtual CAnimBlendStaticAssociationSAInterface* GetInterface() = 0; }; From 1c60b9469ea27b44f9b6d01365ac9e1b4631e569 Mon Sep 17 00:00:00 2001 From: Brophy <123881+Brophy@users.noreply.github.com> Date: Fri, 24 Apr 2026 11:17:45 +0100 Subject: [PATCH 2/3] fix: correct spelling mistakes in comments and documentation --- Client/core/CConsole.cpp | 2 +- Client/core/CGUI.cpp | 2 +- Client/core/CScreenShot.cpp | 2 +- Client/core/CTrayIcon.cpp | 2 +- Client/core/DXHook/CDirect3DHookManager.cpp | 2 +- Client/core/DXHook/CProxyDirect3D9.cpp | 10 +++++----- Client/core/DXHook/CProxyDirect3DEffect.cpp | 4 ++-- Client/core/DXHook/CProxyDirectInput8.cpp | 2 +- Client/core/Graphics/CMaterialLine3DBatcher.cpp | 12 ++++++------ .../core/Graphics/CRenderItem.EffectParameters.cpp | 2 +- Client/game_sa/CCameraSA.cpp | 2 +- Client/game_sa/CHudSA.cpp | 4 ++-- Client/game_sa/CPedSA.h | 2 +- Client/game_sa/CPlayerInfoSA.cpp | 4 ++-- Client/game_sa/CPlayerPedSA.cpp | 2 +- Client/game_sa/CStatsSA.cpp | 8 ++++---- Client/game_sa/CStatsSA.h | 4 ++-- Client/game_sa/CVehicleSA.h | 2 +- Client/game_sa/TaskSA.cpp | 2 +- Client/loader-proxy/main.cpp | 2 +- Client/loader/MainFunctions.cpp | 2 +- Client/mods/deathmatch/ClientCommands.cpp | 2 +- Client/mods/deathmatch/logic/CClientGame.cpp | 10 +++++----- Client/mods/deathmatch/logic/CClientPad.cpp | 2 +- Client/mods/deathmatch/logic/CClientPathManager.cpp | 2 +- Client/mods/deathmatch/logic/CClientPed.cpp | 8 ++++---- Client/mods/deathmatch/logic/CClientStreamer.cpp | 2 +- Client/mods/deathmatch/logic/CPacketHandler.cpp | 2 +- .../deathmatch/logic/CStaticFunctionDefinitions.cpp | 2 +- .../mods/deathmatch/logic/CUnoccupiedVehicleSync.cpp | 2 +- Client/mods/deathmatch/logic/CVehicleNames.cpp | 2 +- Client/mods/deathmatch/logic/lua/CLuaArgument.cpp | 4 ++-- .../deathmatch/logic/lua/CLuaFunctionDefs.Input.cpp | 2 +- .../mods/deathmatch/logic/luadefs/CLuaAudioDefs.cpp | 2 +- .../mods/deathmatch/logic/luadefs/CLuaEngineDefs.cpp | 12 ++++++------ .../deathmatch/logic/luadefs/CLuaVehicleDefs.cpp | 4 ++-- Client/mods/deathmatch/logic/rpc/CWeaponRPCs.cpp | 2 +- Client/multiplayer_sa/multiplayer_shotsync.cpp | 6 +++--- Client/sdk/core/CCVarsInterface.h | 2 +- Client/sdk/game/CStats.h | 4 ++-- Server/core/CExceptionInformation_Impl.cpp | 4 ++-- Server/mods/deathmatch/logic/CConsoleCommands.cpp | 4 ++-- Server/mods/deathmatch/logic/CMapManager.cpp | 4 ++-- Server/mods/deathmatch/logic/CPickup.cpp | 2 +- Server/mods/deathmatch/logic/CResource.cpp | 2 +- Server/mods/deathmatch/logic/CSettings.cpp | 2 +- .../deathmatch/logic/CStaticFunctionDefinitions.cpp | 4 ++-- .../mods/deathmatch/logic/CUnoccupiedVehicleSync.cpp | 2 +- Server/mods/deathmatch/logic/CVehicle.cpp | 2 +- Server/mods/deathmatch/logic/CVehicleNames.cpp | 2 +- Server/mods/deathmatch/logic/lua/CLuaArgument.cpp | 4 ++-- .../deathmatch/logic/luadefs/CLuaVehicleDefs.cpp | 2 +- Server/mods/deathmatch/utils/CHqComms.h | 2 +- Shared/XML/CXMLFileImpl.cpp | 2 +- .../mods/deathmatch/logic/CLatentTransferManager.h | 2 +- Shared/mods/deathmatch/logic/CScriptDebugging.cpp | 2 +- .../mods/deathmatch/logic/lua/CLuaOverloadParser.h | 2 +- Shared/publicsdk/extra/CLuaArgument.cpp | 2 +- Shared/sdk/RTree.h | 2 +- Shared/sdk/SharedUtil.Tests.hpp | 6 +++--- 60 files changed, 100 insertions(+), 100 deletions(-) diff --git a/Client/core/CConsole.cpp b/Client/core/CConsole.cpp index be40befa214..9350863a9f1 100644 --- a/Client/core/CConsole.cpp +++ b/Client/core/CConsole.cpp @@ -123,7 +123,7 @@ bool CConsole::IsEnabled() void CConsole::SetEnabled(bool bEnabled) { - // Hide it if neccessary + // Hide it if necessary if (!bEnabled && m_pWindow->IsVisible()) { SetVisible(false); diff --git a/Client/core/CGUI.cpp b/Client/core/CGUI.cpp index 32edce4e4e8..5d02c526716 100644 --- a/Client/core/CGUI.cpp +++ b/Client/core/CGUI.cpp @@ -745,7 +745,7 @@ bool CLocalGUI::ProcessMessage(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPara return true; case WM_IME_KEYDOWN: { - // Handle space/return seperately in this case + // Handle space/return separately in this case if (wParam == VK_SPACE) pGUI->ProcessCharacter(MapVirtualKey(wParam, MAPVK_VK_TO_CHAR)); diff --git a/Client/core/CScreenShot.cpp b/Client/core/CScreenShot.cpp index 96d260a4d97..410ea32e6b9 100644 --- a/Client/core/CScreenShot.cpp +++ b/Client/core/CScreenShot.cpp @@ -26,7 +26,7 @@ static bool ms_bBeforeGUI = false; static SString ms_strScreenDirectoryPath; -// Last save time, seperated per given type +// Last save time, separated per given type // (normal screenshot or camera weapon initiated) static long long ms_lLastSaveTime[2] = {0, 0}; diff --git a/Client/core/CTrayIcon.cpp b/Client/core/CTrayIcon.cpp index 67ed3a5a126..56a592d5660 100644 --- a/Client/core/CTrayIcon.cpp +++ b/Client/core/CTrayIcon.cpp @@ -69,7 +69,7 @@ bool CTrayIcon::CreateTrayIcon() return false; } - // The handle to the core.dll is neccessary here, + // The handle to the core.dll is necessary here, // because Windows will search for the ICON in the executable and not in the DLL // Note: Changing the size will not show a higher quality icon in the balloon auto hIcon = LoadImage(g_hModule, MAKEINTRESOURCE(IDI_ICON1), IMAGE_ICON, LR_DEFAULTSIZE, LR_DEFAULTSIZE, LR_SHARED | LR_LOADTRANSPARENT); diff --git a/Client/core/DXHook/CDirect3DHookManager.cpp b/Client/core/DXHook/CDirect3DHookManager.cpp index 5421d5fadff..9a57593de2c 100644 --- a/Client/core/DXHook/CDirect3DHookManager.cpp +++ b/Client/core/DXHook/CDirect3DHookManager.cpp @@ -3,7 +3,7 @@ * PROJECT: Multi Theft Auto * LICENSE: See LICENSE in the top level directory * FILE: Client/core/DXHook/CDirect3DHookManager.cpp - * PURPOSE: Direct3D version independant hook manager + * PURPOSE: Direct3D version independent hook manager * * Multi Theft Auto is available from https://multitheftauto.com/ * diff --git a/Client/core/DXHook/CProxyDirect3D9.cpp b/Client/core/DXHook/CProxyDirect3D9.cpp index acc73034c2c..3d6a1562686 100644 --- a/Client/core/DXHook/CProxyDirect3D9.cpp +++ b/Client/core/DXHook/CProxyDirect3D9.cpp @@ -1194,7 +1194,7 @@ namespace // // Hook CCore::OnPreCreateDevice // -// Modify paramters +// Modify parameters // //////////////////////////////////////////////// void CCore::OnPreCreateDevice(IDirect3D9* pDirect3D, UINT Adapter, D3DDEVTYPE DeviceType, HWND hFocusWindow, DWORD& BehaviorFlags, @@ -1224,7 +1224,7 @@ void CCore::OnPreCreateDevice(IDirect3D9* pDirect3D, UINT Adapter, D3DDEVTYPE De BehaviorFlagsOrig = BehaviorFlags; presentationParametersOrig = *pPresentationParameters; - WriteDebugEvent(" Original paramters:"); + WriteDebugEvent(" Original parameters:"); WriteDebugEvent(ToString(Adapter, DeviceType, hFocusWindow, BehaviorFlags, *pPresentationParameters)); // Make sure DirectX Get...() calls will work @@ -1235,7 +1235,7 @@ void CCore::OnPreCreateDevice(IDirect3D9* pDirect3D, UINT Adapter, D3DDEVTYPE De GetVideoModeManager()->PreCreateDevice(pPresentationParameters); - WriteDebugEvent(" Modified paramters:"); + WriteDebugEvent(" Modified parameters:"); WriteDebugEvent(ToString(Adapter, DeviceType, hFocusWindow, BehaviorFlags, *pPresentationParameters)); } @@ -1309,7 +1309,7 @@ HRESULT CCore::OnPostCreateDevice(HRESULT hResult, IDirect3D9* pDirect3D, UINT A BehaviorFlagsOrig = BehaviorFlags; presentationParametersOrig = *pPresentationParameters; - WriteDebugEvent(" Original paramters:"); + WriteDebugEvent(" Original parameters:"); WriteDebugEvent(ToString(Adapter, DeviceType, hFocusWindow, BehaviorFlags, *pPresentationParameters)); // Make sure DirectX Get...() calls will work @@ -1320,7 +1320,7 @@ HRESULT CCore::OnPostCreateDevice(HRESULT hResult, IDirect3D9* pDirect3D, UINT A GetVideoModeManager()->PreCreateDevice(pPresentationParameters); - WriteDebugEvent(" Modified paramters:"); + WriteDebugEvent(" Modified parameters:"); WriteDebugEvent(ToString(Adapter, DeviceType, hFocusWindow, BehaviorFlags, *pPresentationParameters)); hResult = CreateDeviceInsist(2, 1000, pDirect3D, Adapter, DeviceType, hFocusWindow, BehaviorFlags, pPresentationParameters, ppReturnedDeviceInterface); diff --git a/Client/core/DXHook/CProxyDirect3DEffect.cpp b/Client/core/DXHook/CProxyDirect3DEffect.cpp index 2da4dede674..7b396dbf7e7 100644 --- a/Client/core/DXHook/CProxyDirect3DEffect.cpp +++ b/Client/core/DXHook/CProxyDirect3DEffect.cpp @@ -173,7 +173,7 @@ HRESULT CProxyDirect3DEffect::CloneEffect(LPDIRECT3DDEVICE9 pDevice, LPD3DXEFFEC // // MyD3DXCreateEffectFromFile // -// Wrap result of orignal function +// Wrap result of original function // ///////////////////////////////////////////////////////////// HRESULT WINAPI MyD3DXCreateEffectFromFile(LPDIRECT3DDEVICE9 pDevice, LPCSTR pSrcFile, CONST D3DXMACRO* pDefines, LPD3DXINCLUDE pInclude, DWORD Flags, @@ -192,7 +192,7 @@ HRESULT WINAPI MyD3DXCreateEffectFromFile(LPDIRECT3DDEVICE9 pDevice, LPCSTR pSrc // // D3DXCreateEffect // -// Wrap result of orignal function +// Wrap result of original function // ///////////////////////////////////////////////////////////// HRESULT WINAPI MyD3DXCreateEffect(LPDIRECT3DDEVICE9 pDevice, LPCVOID pSrcData, UINT SrcDataLen, CONST D3DXMACRO* pDefines, LPD3DXINCLUDE pInclude, DWORD Flags, diff --git a/Client/core/DXHook/CProxyDirectInput8.cpp b/Client/core/DXHook/CProxyDirectInput8.cpp index cd4309c55b5..2f130a63ccf 100644 --- a/Client/core/DXHook/CProxyDirectInput8.cpp +++ b/Client/core/DXHook/CProxyDirectInput8.cpp @@ -15,7 +15,7 @@ CProxyDirectInput8::CProxyDirectInput8(IDirectInput8* pDevice) { WriteDebugEvent(SString("CProxyDirectInput8::CProxyDirectInput8 %08x", this)); - // Initalize our local variable. + // Initialize our local variable. m_pDevice = pDevice; } diff --git a/Client/core/Graphics/CMaterialLine3DBatcher.cpp b/Client/core/Graphics/CMaterialLine3DBatcher.cpp index 3b81e44c8aa..1f855de818a 100644 --- a/Client/core/Graphics/CMaterialLine3DBatcher.cpp +++ b/Client/core/Graphics/CMaterialLine3DBatcher.cpp @@ -128,7 +128,7 @@ void CMaterialLine3DBatcher::Flush() std::vector indexList; indexList.resize(uiNumLines); uint* pIndices = &indexList[0]; - uint uiNumIndicies = 0; + uint uiNumIndices = 0; // Calculate distances for (uint i = 0; i < uiNumLines; i++) @@ -149,12 +149,12 @@ void CMaterialLine3DBatcher::Flush() continue; } // Add the index for this line to the draw list - pIndices[uiNumIndicies++] = i; + pIndices[uiNumIndices++] = i; } - if (uiNumIndicies > 0) + if (uiNumIndices > 0) { - indexList.resize(uiNumIndicies); + indexList.resize(uiNumIndices); // Sort index list by distance ms_pLines = &m_LineList[0]; @@ -164,12 +164,12 @@ void CMaterialLine3DBatcher::Flush() // Draw index list, batching by material uint uiBatchFirstIndex = 0; - for (uint i = 0; i < uiNumIndicies; i++) + for (uint i = 0; i < uiNumIndices; i++) { const SMaterialLine3DItem& item = ms_pLines[pIndices[i]]; // Flush batch if this is the last index, or the next one uses a different material - if ((i == uiNumIndicies - 1) || item.pMaterial != ms_pLines[pIndices[i + 1]].pMaterial) + if ((i == uiNumIndices - 1) || item.pMaterial != ms_pLines[pIndices[i + 1]].pMaterial) { uint* pBatchIndices = &pIndices[uiBatchFirstIndex]; uint uiNumBatchLines = i - uiBatchFirstIndex + 1; diff --git a/Client/core/Graphics/CRenderItem.EffectParameters.cpp b/Client/core/Graphics/CRenderItem.EffectParameters.cpp index de5558258c9..fd0c41682d2 100644 --- a/Client/core/Graphics/CRenderItem.EffectParameters.cpp +++ b/Client/core/Graphics/CRenderItem.EffectParameters.cpp @@ -1076,7 +1076,7 @@ bool CEffectParameters::TryParseSpecialParameter(D3DXHANDLE hParameter, const D3 // // CEffectParameters::IsSecondaryRenderTarget // -// Return true if paramter is flagged for use as a secondary render target texture +// Return true if parameter is flagged for use as a secondary render target texture // //////////////////////////////////////////////////////////////// bool CEffectParameters::IsSecondaryRenderTarget(D3DXHANDLE hParameter, const D3DXPARAMETER_DESC& ParameterDesc) diff --git a/Client/game_sa/CCameraSA.cpp b/Client/game_sa/CCameraSA.cpp index 74eb515e64a..5d0d0726e64 100644 --- a/Client/game_sa/CCameraSA.cpp +++ b/Client/game_sa/CCameraSA.cpp @@ -146,7 +146,7 @@ void CCameraSA::RestoreWithJumpCut() } /** - * \todo Find out what the last two paramters are + * \todo Find out what the last two parameters are */ void CCameraSA::TakeControl(CEntity* entity, eCamMode CamMode, int CamSwitchStyle) { diff --git a/Client/game_sa/CHudSA.cpp b/Client/game_sa/CHudSA.cpp index ef5a478502b..286f3732160 100644 --- a/Client/game_sa/CHudSA.cpp +++ b/Client/game_sa/CHudSA.cpp @@ -82,7 +82,7 @@ CHudSA::CHudSA() MemPut(0x53E488 + 2, (DWORD)&m_fSniperCrosshairScale); MemPut(0x53E4BF + 2, (DWORD)&m_fSniperCrosshairScale); - // Initalize default data + // Initialize default data componentProperties.hpBar = MapGet(defaultComponentProperties, HUD_HEALTH); componentProperties.breathBar = MapGet(defaultComponentProperties, HUD_BREATH); componentProperties.armorBar = MapGet(defaultComponentProperties, HUD_ARMOUR); @@ -169,7 +169,7 @@ void CHudSA::SetComponentVisible(eHudComponent component, bool bVisible) SHudComponent* pComponent = MapFind(m_HudComponentMap, component); if (pComponent) { - // Save original bytes if requred + // Save original bytes if required if (pComponent->bSaveOriginalBytes) { pComponent->origData = *(DWORD*)pComponent->uiDataAddr; diff --git a/Client/game_sa/CPedSA.h b/Client/game_sa/CPedSA.h index 4f0b7565dcb..7fa41e8f333 100644 --- a/Client/game_sa/CPedSA.h +++ b/Client/game_sa/CPedSA.h @@ -65,7 +65,7 @@ class CPedFlags unsigned int bIsStanding : 1; // is ped standing on something unsigned int bWasStanding : 1; // was ped standing on something unsigned int bIsLooking : 1; // is ped looking at something or in a direction - unsigned int bIsRestoringLook : 1; // is ped restoring head postion from a look + unsigned int bIsRestoringLook : 1; // is ped restoring head position from a look unsigned int bIsAimingGun : 1; // is ped aiming gun unsigned int bIsRestoringGun : 1; // is ped moving gun back to default posn unsigned int bCanPointGunAtTarget : 1; // can ped point gun at target diff --git a/Client/game_sa/CPlayerInfoSA.cpp b/Client/game_sa/CPlayerInfoSA.cpp index a0020e3ddf2..0581c6a4b5c 100644 --- a/Client/game_sa/CPlayerInfoSA.cpp +++ b/Client/game_sa/CPlayerInfoSA.cpp @@ -22,7 +22,7 @@ CWanted* CPlayerInfoSA::GetWanted() /** * Gets the amount of money the player has - * @return DWORD containing the ammount of money the player has + * @return DWORD containing the amount of money the player has */ long CPlayerInfoSA::GetPlayerMoney() { @@ -32,7 +32,7 @@ long CPlayerInfoSA::GetPlayerMoney() /** * Sets the amount of money the player has - * @param dwMoney DWORD containing the ammount of money you wish the player to have + * @param dwMoney DWORD containing the amount of money you wish the player to have */ void CPlayerInfoSA::SetPlayerMoney(long lMoney, bool bInstant) { diff --git a/Client/game_sa/CPlayerPedSA.cpp b/Client/game_sa/CPlayerPedSA.cpp index 80df2469a41..c6f415bc75e 100644 --- a/Client/game_sa/CPlayerPedSA.cpp +++ b/Client/game_sa/CPlayerPedSA.cpp @@ -211,7 +211,7 @@ bool IsBlendAssocGroupValid(int iGroup) CAnimBlendStaticAssociationSAInterface* pAssociation = pBlendAssocGroup->pAssociationsArray + iUseAnimId; if (pAssociation == NULL) return false; - if (pAssociation->pAnimHeirarchy == NULL) + if (pAssociation->pAnimHierarchy == NULL) return false; } return true; diff --git a/Client/game_sa/CStatsSA.cpp b/Client/game_sa/CStatsSA.cpp index e6a99efe1ea..40aea4ae209 100644 --- a/Client/game_sa/CStatsSA.cpp +++ b/Client/game_sa/CStatsSA.cpp @@ -30,7 +30,7 @@ float CStatsSA::GetStatValue(unsigned short usIndex) return fReturn; } -void CStatsSA::ModifyStat(unsigned short usIndex, float fAmmount) +void CStatsSA::ModifyStat(unsigned short usIndex, float fAmount) { DWORD dwFunc = FUNC_ModifyStat; DWORD dwStatIndex = usIndex; @@ -38,7 +38,7 @@ void CStatsSA::ModifyStat(unsigned short usIndex, float fAmmount) // clang-format off __asm { - push fAmmount + push fAmount push dwStatIndex call dwFunc add esp, 8 @@ -46,7 +46,7 @@ void CStatsSA::ModifyStat(unsigned short usIndex, float fAmmount) // clang-format on } -void CStatsSA::SetStatValue(unsigned short usIndex, float fAmmount) +void CStatsSA::SetStatValue(unsigned short usIndex, float fAmount) { DWORD dwFunc = FUNC_SetStatValue; DWORD dwStatIndex = usIndex; @@ -54,7 +54,7 @@ void CStatsSA::SetStatValue(unsigned short usIndex, float fAmmount) // clang-format off __asm { - push fAmmount + push fAmount push dwStatIndex call dwFunc add esp, 8 diff --git a/Client/game_sa/CStatsSA.h b/Client/game_sa/CStatsSA.h index 37a393f91b6..bfe9398dfb4 100644 --- a/Client/game_sa/CStatsSA.h +++ b/Client/game_sa/CStatsSA.h @@ -22,8 +22,8 @@ class CStatsSA : public CStats { public: float GetStatValue(unsigned short usIndex); - void ModifyStat(unsigned short usIndex, float fAmmount); - void SetStatValue(unsigned short usIndex, float fAmmount); + void ModifyStat(unsigned short usIndex, float fAmount); + void SetStatValue(unsigned short usIndex, float fAmount); unsigned short GetSkillStatIndex(eWeaponType type); }; diff --git a/Client/game_sa/CVehicleSA.h b/Client/game_sa/CVehicleSA.h index 92a6dd19a52..d9e8700d00a 100644 --- a/Client/game_sa/CVehicleSA.h +++ b/Client/game_sa/CVehicleSA.h @@ -137,7 +137,7 @@ struct CVehicleFlags unsigned char bLowVehicle : 1; // Need this for sporty type cars to use low getting-in/out anims unsigned char bComedyControls : 1; // Will make the car hard to control (hopefully in a funny way) unsigned char bWarnedPeds : 1; // Has scan and warn peds of danger been processed? - unsigned char bCraneMessageDone : 1; // A crane message has been printed for this car allready + unsigned char bCraneMessageDone : 1; // A crane message has been printed for this car already // unsigned char bExtendedRange: 1; // This vehicle needs to be a bit further away to get deleted unsigned char bTakeLessDamage : 1; // This vehicle is stronger (takes about 1/4 of damage) diff --git a/Client/game_sa/TaskSA.cpp b/Client/game_sa/TaskSA.cpp index 1184e8be9d9..4306fbdd722 100644 --- a/Client/game_sa/TaskSA.cpp +++ b/Client/game_sa/TaskSA.cpp @@ -37,7 +37,7 @@ CTaskSA::~CTaskSA() dwTasksAlive--; } -// alocate memory for the task (ammount nSize) +// allocate memory for the task (amount nSize) void CTaskSA::CreateTaskInterface(size_t nSize) { // Safety margin. I see GTA allocate more than we do for some tasks. We could create diff --git a/Client/loader-proxy/main.cpp b/Client/loader-proxy/main.cpp index db8d3b0bd1b..ea1c2835e82 100644 --- a/Client/loader-proxy/main.cpp +++ b/Client/loader-proxy/main.cpp @@ -535,7 +535,7 @@ BOOL WINAPI MyGetVersionExA(LPOSVERSIONINFOA versionInfo) // Execute the original function with the given parameter. BOOL result = Win32GetVersionExA(versionInfo); - // Restore the function pointer we've overriden to get here. + // Restore the function pointer we've overridden to get here. SetImportProcAddress("kernel32.dll", "GetVersionExA", FunctionPtrToFarProc(Win32GetVersionExA)); // Run our startup code. diff --git a/Client/loader/MainFunctions.cpp b/Client/loader/MainFunctions.cpp index 9693f070bd8..9835474ca74 100644 --- a/Client/loader/MainFunctions.cpp +++ b/Client/loader/MainFunctions.cpp @@ -898,7 +898,7 @@ void ConfigureWerDumpPath() // Commands are often stored in the registry by the installer and client. // // "L0" is opened before the launch sequence and is closed if MTA shutsdown with no error -// "L1" is opened before the launch sequence and is closed if GTA is succesfully started +// "L1" is opened before the launch sequence and is closed if GTA is successfully started // "CR1" is a counter which is incremented if GTA was not started and MTA shutsdown with an error // // "L2" is opened before the launch sequence and is closed if the GTA loading screen is shown diff --git a/Client/mods/deathmatch/ClientCommands.cpp b/Client/mods/deathmatch/ClientCommands.cpp index 5130f900626..0e10d41e91c 100644 --- a/Client/mods/deathmatch/ClientCommands.cpp +++ b/Client/mods/deathmatch/ClientCommands.cpp @@ -717,7 +717,7 @@ void COMMAND_DumpPlayers(const char* szCmdLine) // End of the dump. Close it fclose(pFile); - g_pCore->GetConsole()->Print("dumpplayers: Dumping successfull"); + g_pCore->GetConsole()->Print("dumpplayers: Dumping successful"); } else g_pCore->GetConsole()->Print("dumpplayers: Unable to create file"); diff --git a/Client/mods/deathmatch/logic/CClientGame.cpp b/Client/mods/deathmatch/logic/CClientGame.cpp index e723c22ddca..e83cf5c7d47 100644 --- a/Client/mods/deathmatch/logic/CClientGame.cpp +++ b/Client/mods/deathmatch/logic/CClientGame.cpp @@ -679,7 +679,7 @@ bool CClientGame::StartGame(const char* szNick, const char* szPassword, eServerT NetBitStreamInterface* pBitStream = g_pNet->AllocateNetBitStream(); if (pBitStream) { - // Hash the password if neccessary + // Hash the password if necessary MD5 Password; memset(Password.data, 0, sizeof(MD5)); if (szPassword) @@ -1680,7 +1680,7 @@ void CClientGame::SetMimic(unsigned int uiMimicCount) if (uiMimicCount > MAX_MIMICS) return; - // Create neccessary players + // Create necessary players while (m_Mimics.size() < uiMimicCount) { CClientPlayer* pPlayer = new CClientPlayer(m_pManager, static_cast(MAX_NET_PLAYERS_REAL + (int)m_Mimics.size())); @@ -1688,7 +1688,7 @@ void CClientGame::SetMimic(unsigned int uiMimicCount) m_Mimics.push_back(pPlayer); } - // Destroy neccessary players + // Destroy necessary players while (m_Mimics.size() > uiMimicCount) { CClientPlayer* pPlayer = m_Mimics.back(); @@ -4019,7 +4019,7 @@ bool CClientGame::AssocGroupCopyAnimationHandler(CAnimBlendAssociationSAInterfac } auto pOriginalAnimStaticAssoc = pAnimationManager->GetAnimStaticAssociation(iGroupID, animID); - auto pOriginalAnimHierarchyInterface = pOriginalAnimStaticAssoc->GetAnimHierachyInterface(); + auto pOriginalAnimHierarchyInterface = pOriginalAnimStaticAssoc->GetAnimHierarchyInterface(); auto pAnimAssociation = pAnimationManager->GetAnimBlendAssociation(pAnimAssocInterface); CClientPed* pClientPed = GetClientPedByClump(*pClump); @@ -4036,7 +4036,7 @@ bool CClientGame::AssocGroupCopyAnimationHandler(CAnimBlendAssociationSAInterfac (iGroupID >= eAnimGroup::ANIM_GROUP_PLAYER && iGroupID <= eAnimGroup::ANIM_GROUP_PLAYERJETPACK) || iGroupID >= eAnimGroup::ANIM_GROUP_MAN) { auto pDuckAnimStaticAssoc = pAnimationManager->GetAnimStaticAssociation(eAnimGroup::ANIM_GROUP_DEFAULT, eAnimID::ANIM_ID_WEAPON_CROUCH); - pAnimHierarchy = pAnimationManager->GetCustomAnimBlendHierarchy(pDuckAnimStaticAssoc->GetAnimHierachyInterface()); + pAnimHierarchy = pAnimationManager->GetCustomAnimBlendHierarchy(pDuckAnimStaticAssoc->GetAnimHierarchyInterface()); isCustomAnimationToPlay = true; } } diff --git a/Client/mods/deathmatch/logic/CClientPad.cpp b/Client/mods/deathmatch/logic/CClientPad.cpp index d87e0c8130f..ccd9bc833a0 100644 --- a/Client/mods/deathmatch/logic/CClientPad.cpp +++ b/Client/mods/deathmatch/logic/CClientPad.cpp @@ -746,7 +746,7 @@ void CClientPad::ProcessControl(short& usControlValue, unsigned int uiIndex) // // usControlValue is the updated input value we get from the player // m_sScriptedStates contains our script value - // m_bScriptedStatesNextFrameOverride if the player input should be forcefully overriden for the next frame + // m_bScriptedStatesNextFrameOverride if the player input should be forcefully overridden for the next frame // // // old behavior or (override == false) diff --git a/Client/mods/deathmatch/logic/CClientPathManager.cpp b/Client/mods/deathmatch/logic/CClientPathManager.cpp index 906032fe113..d47ad2b1e51 100644 --- a/Client/mods/deathmatch/logic/CClientPathManager.cpp +++ b/Client/mods/deathmatch/logic/CClientPathManager.cpp @@ -88,7 +88,7 @@ void CClientPathManager::ReverseNodes(CClientPathNode* pPathNode) pPathNode = pPathNode->GetPreviousNode(); } while (pPathNode && pPathNode != pTempNode); - // Go through the chain untill we've reached an end or looped, and reverse + // Go through the chain until we've reached an end or looped, and reverse pTempNode = pFirstNode; do { diff --git a/Client/mods/deathmatch/logic/CClientPed.cpp b/Client/mods/deathmatch/logic/CClientPed.cpp index 058186bcc89..0bb55aef9a8 100644 --- a/Client/mods/deathmatch/logic/CClientPed.cpp +++ b/Client/mods/deathmatch/logic/CClientPed.cpp @@ -2482,7 +2482,7 @@ eMovementState CClientPed::GetMovementState() } else { - // Is he moving the contoller at all? + // Is he moving the controller at all? if (cs.LeftStickX == 0 && cs.LeftStickY == 0) return MOVEMENTSTATE_CROUCH; else @@ -4108,7 +4108,7 @@ void CClientPed::RebuildModel(bool bDelayChange) // We are CJ? if (m_ulModel == 0) { - // Adds only the neccesary textures + // Adds only the necessary textures m_pClothes->RefreshClothes(); m_pClothes->AddAllToModel(); @@ -5836,7 +5836,7 @@ void CClientPed::RunNamedAnimation(std::unique_ptr& pBlock, const ch flags |= 0x80; } - // Kill any higher priority tasks if we dont want this anim interuptable + // Kill any higher priority tasks if we dont want this anim interruptible if (!bInterruptable) { KillTask(TASK_PRIORITY_PHYSICAL_RESPONSE); @@ -6336,7 +6336,7 @@ void CClientPed::RestoreAllAnimations() auto pAnimStaticAssociation = pAnimationManager->GetAnimStaticAssociation(iGroupID, iAnimID); if (pAnimStaticAssociation && pAnimHierarchy->IsCustom()) { - auto pAnimHierarchyInterface = pAnimStaticAssociation->GetAnimHierachyInterface(); + auto pAnimHierarchyInterface = pAnimStaticAssociation->GetAnimHierarchyInterface(); CIFPEngine::EngineApplyAnimation(*this, pAnimHierarchyInterface, pAnimHierarchyInterface); } } diff --git a/Client/mods/deathmatch/logic/CClientStreamer.cpp b/Client/mods/deathmatch/logic/CClientStreamer.cpp index 12460430ad8..0b528da8309 100644 --- a/Client/mods/deathmatch/logic/CClientStreamer.cpp +++ b/Client/mods/deathmatch/logic/CClientStreamer.cpp @@ -573,7 +573,7 @@ void CClientStreamer::Restream(bool bMovedFar) if (iMaxIn <= 0 || iMaxOut <= 0) break; - // Check indicies are valid + // Check indices are valid if (iFurthestStreamedInIndex < 0) break; if (uiClosestStreamedOutIndex >= ClosestStreamedOutList.size()) diff --git a/Client/mods/deathmatch/logic/CPacketHandler.cpp b/Client/mods/deathmatch/logic/CPacketHandler.cpp index 113fe537742..b46c7497c31 100644 --- a/Client/mods/deathmatch/logic/CPacketHandler.cpp +++ b/Client/mods/deathmatch/logic/CPacketHandler.cpp @@ -30,7 +30,7 @@ class CCore; std::wstring utf8_mbstowcs(const std::string& str); std::string utf8_wcstombs(const std::wstring& wstr); -// TODO: Make this independant of g_pClientGame. Just moved it here to get it out of the +// TODO: Make this independent of g_pClientGame. Just moved it here to get it out of the // horribly big CClientGame file. bool CPacketHandler::ProcessPacket(unsigned char ucPacketID, NetBitStreamInterface& bitStream) { diff --git a/Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp b/Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp index 2bb48dcff87..19518003999 100644 --- a/Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp +++ b/Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp @@ -9998,7 +9998,7 @@ bool CStaticFunctionDefinitions::WarpPedIntoVehicle(CClientPed* pPed, CClientVeh if (pPed->IsDead() || pVehicle->GetHealth() <= 0.0f) return false; - // Toss the previous player out of it if neccessary + // Toss the previous player out of it if necessary if (CClientPed* pPreviousOccupant = pVehicle->GetOccupant(uiSeat)) RemovePedFromVehicle(pPreviousOccupant); diff --git a/Client/mods/deathmatch/logic/CUnoccupiedVehicleSync.cpp b/Client/mods/deathmatch/logic/CUnoccupiedVehicleSync.cpp index b4dbe67ea88..f4ef2c01025 100644 --- a/Client/mods/deathmatch/logic/CUnoccupiedVehicleSync.cpp +++ b/Client/mods/deathmatch/logic/CUnoccupiedVehicleSync.cpp @@ -220,7 +220,7 @@ void CUnoccupiedVehicleSync::UpdateDamageModels() list::const_iterator iter = m_List.begin(); for (; iter != m_List.end(); iter++) { - // Sync its damage model changes if neccessary + // Sync its damage model changes if necessary (*iter)->SyncDamageModel(); } } diff --git a/Client/mods/deathmatch/logic/CVehicleNames.cpp b/Client/mods/deathmatch/logic/CVehicleNames.cpp index 5de6553d859..7a568f5ca20 100644 --- a/Client/mods/deathmatch/logic/CVehicleNames.cpp +++ b/Client/mods/deathmatch/logic/CVehicleNames.cpp @@ -17,7 +17,7 @@ const char* const szVehicleNameEmpty = ""; struct SVehicleName { const char* szName; - const char* szName_replaced; // Compatability + const char* szName_replaced; // Compatibility }; static const SFixedArray VehicleNames = {{{"Landstalker"}, diff --git a/Client/mods/deathmatch/logic/lua/CLuaArgument.cpp b/Client/mods/deathmatch/logic/lua/CLuaArgument.cpp index 366a03cc705..51aff713d4f 100644 --- a/Client/mods/deathmatch/logic/lua/CLuaArgument.cpp +++ b/Client/mods/deathmatch/logic/lua/CLuaArgument.cpp @@ -73,7 +73,7 @@ void CLuaArgument::CopyRecursive(const CLuaArgument& Argument, CFastHashMapSetCollisionSpecialResponseCase(eColRepsonse); + pGroup->SetCollisionSpecialResponseCase(eColResponse); lua_pushboolean(luaVM, true); return 1; } @@ -2359,11 +2359,11 @@ int CLuaEngineDefs::EngineGetObjectGroupPhysicalProperty(lua_State* luaVM) } case ObjectGroupPhysicalProperties::Modifiable::SPECIALCOLRESPONSE: { - ObjectGroupPhysicalProperties::CollisionResponse eColRepsonse = pGroup->GetCollisionSpecialResponseCase(); - if (!EnumValueValid(eColRepsonse)) + ObjectGroupPhysicalProperties::CollisionResponse eColResponse = pGroup->GetCollisionSpecialResponseCase(); + if (!EnumValueValid(eColResponse)) break; - lua_pushstring(luaVM, EnumToString(eColRepsonse)); + lua_pushstring(luaVM, EnumToString(eColResponse)); return 1; } case ObjectGroupPhysicalProperties::Modifiable::FXTYPE: diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp index d45bdf2b908..80137594c94 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp @@ -3202,7 +3202,7 @@ int CLuaVehicleDefs::SetVehicleSirens(lua_State* luaVM) { if (ucSirenID > 0 && ucSirenID < 9) { - // Array indicies start at 0 so compensate here. This way all code works properly and we get nice 1-8 numbers for API + // Array indices start at 0 so compensate here. This way all code works properly and we get nice 1-8 numbers for API ucSirenID--; argStream.ReadVector3D(tSirenInfo.m_tSirenInfo[ucSirenID].m_vecSirenPositions); argStream.ReadNumber(tSirenInfo.m_tSirenInfo[ucSirenID].m_RGBBeaconColour.R); @@ -4417,7 +4417,7 @@ bool CLuaVehicleDefs::SetSmokeTrailEnabled(CClientVehicle* vehicle, bool state) { std::uint16_t model = vehicle->GetModel(); if (model != 512 && model != 513) - throw LuaFunctionError("Invaild model ID"); + throw LuaFunctionError("Invalid model ID"); vehicle->SetSmokeTrailEnabled(state); return true; diff --git a/Client/mods/deathmatch/logic/rpc/CWeaponRPCs.cpp b/Client/mods/deathmatch/logic/rpc/CWeaponRPCs.cpp index 3b8f90b1078..0120afb9a3c 100644 --- a/Client/mods/deathmatch/logic/rpc/CWeaponRPCs.cpp +++ b/Client/mods/deathmatch/logic/rpc/CWeaponRPCs.cpp @@ -127,7 +127,7 @@ void CWeaponRPCs::TakeWeapon(CClientEntity* pSource, NetBitStreamInterface& bitS CClientPed* pPed = m_pPedManager->Get(pSource->GetID(), true); if (pPed) { - // Is the weapon id valid? (may not be neccessary, just being safe) + // Is the weapon id valid? (may not be necessary, just being safe) if (CClientPickupManager::IsValidWeaponID(ucWeaponID)) { // Have we ammo in packet? If so, we need to take the ammo, not weapon diff --git a/Client/multiplayer_sa/multiplayer_shotsync.cpp b/Client/multiplayer_sa/multiplayer_shotsync.cpp index 306e36c8c28..6b985a8394d 100644 --- a/Client/multiplayer_sa/multiplayer_shotsync.cpp +++ b/Client/multiplayer_sa/multiplayer_shotsync.cpp @@ -285,7 +285,7 @@ static void Event_BulletImpact() } else { - // Correct start postion if remote player + // Correct start position if remote player CRemoteDataStorageSA* data = CRemoteDataSA::GetRemoteDataStorage(pBulletImpactInitiator); if (data) { @@ -374,7 +374,7 @@ static void __declspec(naked) HOOK_SkipAim() // If this is the local player if (IsLocalPlayer(pATargetingPed)) { - // Store wheter he's aiming up or not + // Store whether he's aiming up or not pMultiplayer->m_bAkimboTargetUp = *pSkipAim; } else @@ -395,7 +395,7 @@ static void __declspec(naked) HOOK_SkipAim() } } - // Return to the correct place wheter we put our arms up or not + // Return to the correct place whether we put our arms up or not if (*pSkipAim) { // clang-format off diff --git a/Client/sdk/core/CCVarsInterface.h b/Client/sdk/core/CCVarsInterface.h index 497538edf41..290851fbcad 100644 --- a/Client/sdk/core/CCVarsInterface.h +++ b/Client/sdk/core/CCVarsInterface.h @@ -16,7 +16,7 @@ class CCVarsInterface { public: - // Existance check + // Existence check virtual bool Exists(const std::string& strVariable) = 0; // Get queries diff --git a/Client/sdk/game/CStats.h b/Client/sdk/game/CStats.h index e2b814bd747..80af253a355 100644 --- a/Client/sdk/game/CStats.h +++ b/Client/sdk/game/CStats.h @@ -547,8 +547,8 @@ class CStats { public: virtual float GetStatValue(unsigned short usIndex) = 0; - virtual void ModifyStat(unsigned short usIndex, float fAmmount) = 0; - virtual void SetStatValue(unsigned short usIndex, float fAmmount) = 0; + virtual void ModifyStat(unsigned short usIndex, float fAmount) = 0; + virtual void SetStatValue(unsigned short usIndex, float fAmount) = 0; virtual unsigned short GetSkillStatIndex(eWeaponType type) = 0; }; diff --git a/Server/core/CExceptionInformation_Impl.cpp b/Server/core/CExceptionInformation_Impl.cpp index e3d6d6c6534..8d0bd045695 100644 --- a/Server/core/CExceptionInformation_Impl.cpp +++ b/Server/core/CExceptionInformation_Impl.cpp @@ -128,8 +128,8 @@ void CExceptionInformation_Impl::Set(unsigned int iCode, _EXCEPTION_POINTERS* pE } /** - * Returns the name of the module in which the exception occured, or - * an emtpy string if the module could not be found. + * Returns the name of the module in which the exception occurred, or + * an empty string if the module could not be found. * * @return true if successful, false otherwise. */ diff --git a/Server/mods/deathmatch/logic/CConsoleCommands.cpp b/Server/mods/deathmatch/logic/CConsoleCommands.cpp index b5801f12fa2..822c97165bb 100644 --- a/Server/mods/deathmatch/logic/CConsoleCommands.cpp +++ b/Server/mods/deathmatch/logic/CConsoleCommands.cpp @@ -638,7 +638,7 @@ bool CConsoleCommands::Msg(CConsole* pConsole, const char* szInArguments, CClien // Send it to the player pPlayer->Send(CChatEchoPacket(strMessage, CHATCOLOR_INFO, false, MESSAGE_TYPE_PRIVATE)); - // Send a reponse to the player who sent it + // Send a response to the player who sent it pEchoClient->SendEcho(SString("-> %s: %s", pPlayer->GetNick(), szMessage)); } break; @@ -788,7 +788,7 @@ bool CConsoleCommands::Nick(CConsole* pConsole, const char* szArguments, CClient const char* szNick = pClient->GetNick(); if (!szNick || strcmp(szNewNick, szNick) != 0) { - // Check that it doesn't already exist, or if it matches our current nick case-independantly (means we changed to the same nick but + // Check that it doesn't already exist, or if it matches our current nick case-independently (means we changed to the same nick but // in a different case) if ((szNick && stricmp(szNick, szNewNick) == 0) || !pConsole->GetPlayerManager()->Get(szNewNick)) { diff --git a/Server/mods/deathmatch/logic/CMapManager.cpp b/Server/mods/deathmatch/logic/CMapManager.cpp index ebdcc3799f3..886b210f726 100644 --- a/Server/mods/deathmatch/logic/CMapManager.cpp +++ b/Server/mods/deathmatch/logic/CMapManager.cpp @@ -105,7 +105,7 @@ CElement* CMapManager::LoadMapData(CResource& Loader, CElement& Parent, CXMLNode return pLoadedRoot; } - // If unsuccessfull, destroy the new elements. Remember removing it from our element group. + // If unsuccessful, destroy the new elements. Remember removing it from our element group. CElementGroup* pElementGroup = Loader.GetElementGroup(); vector::const_iterator iter = ElementsAdded.begin(); for (; iter != ElementsAdded.end(); iter++) @@ -726,7 +726,7 @@ void CMapManager::SetUpVisibleToReferences(CElement* pElement) void CMapManager::ProcessVisibleToData(CPerPlayerEntity& Entity) { - // Grab the visibleTo custom data and parse it to add the neccessary references + // Grab the visibleTo custom data and parse it to add the necessary references char szBuffer[256]; szBuffer[255] = 0; if (Entity.GetCustomDataString("visibleTo", szBuffer, 256, true)) diff --git a/Server/mods/deathmatch/logic/CPickup.cpp b/Server/mods/deathmatch/logic/CPickup.cpp index e53feb200a5..d22054b415d 100644 --- a/Server/mods/deathmatch/logic/CPickup.cpp +++ b/Server/mods/deathmatch/logic/CPickup.cpp @@ -434,7 +434,7 @@ void CPickup::Use(CPlayer& Player) // Tell him to play the sound and hide/show it Player.Send(CPickupHitConfirmPacket(this, true)); - // Tell everyone else to hide/show it as neccessary + // Tell everyone else to hide/show it as necessary g_pGame->GetPlayerManager()->BroadcastOnlyJoined(CPickupHitConfirmPacket(this, false), &Player); // Handle it depending on the type diff --git a/Server/mods/deathmatch/logic/CResource.cpp b/Server/mods/deathmatch/logic/CResource.cpp index bf1982acb28..dc43fdfdb33 100644 --- a/Server/mods/deathmatch/logic/CResource.cpp +++ b/Server/mods/deathmatch/logic/CResource.cpp @@ -2203,7 +2203,7 @@ bool CResource::IncludedFileExists(const char* szName, int iType) // Is it the required type? if (iType == CResourceFile::RESOURCE_FILE_TYPE_NONE || pResourceFile->GetType() == iType) { - // Check if the name compares equal (case independant) + // Check if the name compares equal (case independent) if (!stricmp(pResourceFile->GetName(), szName)) return true; } diff --git a/Server/mods/deathmatch/logic/CSettings.cpp b/Server/mods/deathmatch/logic/CSettings.cpp index 9f6f049c10c..636c52a38e2 100644 --- a/Server/mods/deathmatch/logic/CSettings.cpp +++ b/Server/mods/deathmatch/logic/CSettings.cpp @@ -433,7 +433,7 @@ inline const char* CSettings::GetResourceName(const char* szSetting, char* szBuf // Get the position of the delimiter unsigned int uiPos = (unsigned int)(szChr - szSetting); - // Locate the first occurence of the delimiter in the name and use it to substring the name + // Locate the first occurrence of the delimiter in the name and use it to substring the name strncpy(szBuffer, szSetting, (uiPos > uiLength) ? uiLength : uiPos); szBuffer[(uiPos > uiLength) ? uiLength : uiPos] = 0; diff --git a/Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp b/Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp index d91d9033226..f0c5906fc5b 100644 --- a/Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp +++ b/Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp @@ -2176,7 +2176,7 @@ bool CStaticFunctionDefinitions::SetPlayerName(CElement* pElement, const char* s const char* szNick = pPlayer->GetNick(); if (szNick == NULL || strcmp(szName, szNick) != 0) { - // Check that it doesn't already exist, or if it matches our current nick case-independantly (means we changed to the same nick but in a + // Check that it doesn't already exist, or if it matches our current nick case-independently (means we changed to the same nick but in a // different case) if ((szNick && stricmp(szNick, szName) == 0) || m_pPlayerManager->Get(szName) == NULL) { @@ -4297,7 +4297,7 @@ bool CStaticFunctionDefinitions::WarpPedIntoVehicle(CPed* pPed, CVehicle* pVehic // Make sure no one is entering or he will get stuck in the entry packet handshaking and network trouble if (pPreviousOccupant == NULL || (pPreviousOccupant && pPreviousOccupant->GetVehicleAction() == CPed::VEHICLEACTION_NONE)) { - // Toss the previous player out of it if neccessary + // Toss the previous player out of it if necessary if (pPreviousOccupant) { // Remove him from the vehicle diff --git a/Server/mods/deathmatch/logic/CUnoccupiedVehicleSync.cpp b/Server/mods/deathmatch/logic/CUnoccupiedVehicleSync.cpp index 6f9a0678b9d..ee73d5d0dbb 100644 --- a/Server/mods/deathmatch/logic/CUnoccupiedVehicleSync.cpp +++ b/Server/mods/deathmatch/logic/CUnoccupiedVehicleSync.cpp @@ -345,7 +345,7 @@ void CUnoccupiedVehicleSync::Packet_UnoccupiedVehicleSync(CUnoccupiedVehicleSync } } pVehicle->SetHealth(vehicle.data.fHealth); - // Stops sync + fixVehicle/setElementHealth conflicts triggering onVehicleDamage by having a seperate stored float keeping track of + // Stops sync + fixVehicle/setElementHealth conflicts triggering onVehicleDamage by having a separate stored float keeping track of // ONLY what comes in via sync // - Caz pVehicle->SetLastSyncedHealth(vehicle.data.fHealth); diff --git a/Server/mods/deathmatch/logic/CVehicle.cpp b/Server/mods/deathmatch/logic/CVehicle.cpp index 29b4749a5bc..7d263140e05 100644 --- a/Server/mods/deathmatch/logic/CVehicle.cpp +++ b/Server/mods/deathmatch/logic/CVehicle.cpp @@ -175,7 +175,7 @@ CVehicle::~CVehicle() CElementRefManager::RemoveElementRefs(ELEMENT_REF_DEBUG(this, "CVehicle"), &m_pTowedVehicle, &m_pTowedByVehicle, &m_pSyncer, &m_pJackingPed, NULL); - // Notify the vehicle manager that we are not to be respawned anymore if neccessary + // Notify the vehicle manager that we are not to be respawned anymore if necessary if (m_bRespawnEnabled) m_pVehicleManager->GetRespawnEnabledVehicles().remove(this); diff --git a/Server/mods/deathmatch/logic/CVehicleNames.cpp b/Server/mods/deathmatch/logic/CVehicleNames.cpp index ae8d51085fc..e1208df9c1f 100644 --- a/Server/mods/deathmatch/logic/CVehicleNames.cpp +++ b/Server/mods/deathmatch/logic/CVehicleNames.cpp @@ -18,7 +18,7 @@ const char* szVehicleNameEmpty = ""; struct SVehicleName { const char* szName; - const char* szName_replaced; // Compatability + const char* szName_replaced; // Compatibility }; static const SFixedArray VehicleNames = {{{"Landstalker"}, diff --git a/Server/mods/deathmatch/logic/lua/CLuaArgument.cpp b/Server/mods/deathmatch/logic/lua/CLuaArgument.cpp index de36740c68c..03694f92fd7 100644 --- a/Server/mods/deathmatch/logic/lua/CLuaArgument.cpp +++ b/Server/mods/deathmatch/logic/lua/CLuaArgument.cpp @@ -59,7 +59,7 @@ void CLuaArgument::CopyRecursive(const CLuaArgument& Argument, CFastHashMap 0 && ucSirenID < 9) { - // Array indicies start at 0 so compensate here. This way all code works properly and we get nice 1-8 numbers for API + // Array indices start at 0 so compensate here. This way all code works properly and we get nice 1-8 numbers for API ucSirenID--; argStream.ReadVector3D(tSirenInfo.m_tSirenInfo[ucSirenID].m_vecSirenPositions); argStream.ReadNumber(tSirenInfo.m_tSirenInfo[ucSirenID].m_RGBBeaconColour.R); diff --git a/Server/mods/deathmatch/utils/CHqComms.h b/Server/mods/deathmatch/utils/CHqComms.h index 18ddeba4f35..edc08ffe246 100644 --- a/Server/mods/deathmatch/utils/CHqComms.h +++ b/Server/mods/deathmatch/utils/CHqComms.h @@ -158,7 +158,7 @@ class CHqComms : public CRefCountable } } - // Messsage for this server from HQ + // Message for this server from HQ void ProcessMessage(CBitStream& bitStream) { int iMessageAlwaysPrint = 0; diff --git a/Shared/XML/CXMLFileImpl.cpp b/Shared/XML/CXMLFileImpl.cpp index c14cc568a0c..fa8713040b7 100644 --- a/Shared/XML/CXMLFileImpl.cpp +++ b/Shared/XML/CXMLFileImpl.cpp @@ -203,7 +203,7 @@ CXMLNode* CXMLFileImpl::CreateRootNode(const std::string& strTagName) // Make sure we always have a root node if (!m_pRootNode) { - // Grab the document's root, create it if neccessary + // Grab the document's root, create it if necessary TiXmlElement* pRootNode = m_pDocument->RootElement(); if (!pRootNode) { diff --git a/Shared/mods/deathmatch/logic/CLatentTransferManager.h b/Shared/mods/deathmatch/logic/CLatentTransferManager.h index 7850b18d939..7620d111974 100644 --- a/Shared/mods/deathmatch/logic/CLatentTransferManager.h +++ b/Shared/mods/deathmatch/logic/CLatentTransferManager.h @@ -136,7 +136,7 @@ class CLatentSendQueue // // CLatentReceiver // -// Keeps track of the current SReceiveItem being transfered from a remote connection +// Keeps track of the current SReceiveItem being transferred from a remote connection // /////////////////////////////////////////////////////////////// class CLatentReceiver diff --git a/Shared/mods/deathmatch/logic/CScriptDebugging.cpp b/Shared/mods/deathmatch/logic/CScriptDebugging.cpp index ff37d7d7481..b1e9219ce01 100644 --- a/Shared/mods/deathmatch/logic/CScriptDebugging.cpp +++ b/Shared/mods/deathmatch/logic/CScriptDebugging.cpp @@ -291,7 +291,7 @@ void CScriptDebugging::LogString(const char* szPrePend, const SLuaDebugInfo& lua } // -// Get best debug info we possibly can from the relevent lua state +// Get best debug info we possibly can from the relevant lua state // const SLuaDebugInfo& CScriptDebugging::GetLuaDebugInfo(lua_State* luaVM) { diff --git a/Shared/mods/deathmatch/logic/lua/CLuaOverloadParser.h b/Shared/mods/deathmatch/logic/lua/CLuaOverloadParser.h index be5a61eaf01..c9032926bd0 100644 --- a/Shared/mods/deathmatch/logic/lua/CLuaOverloadParser.h +++ b/Shared/mods/deathmatch/logic/lua/CLuaOverloadParser.h @@ -54,7 +54,7 @@ struct CLuaOverloadParser } } - // Chose an overload that the Nth paramter matches + // Chose an overload that the Nth parameter matches template static ChosenFunction MakeChoice(std::variant var) { diff --git a/Shared/publicsdk/extra/CLuaArgument.cpp b/Shared/publicsdk/extra/CLuaArgument.cpp index 22920378faa..d98d1c79e28 100644 --- a/Shared/publicsdk/extra/CLuaArgument.cpp +++ b/Shared/publicsdk/extra/CLuaArgument.cpp @@ -83,7 +83,7 @@ CLuaArgument::~CLuaArgument() const CLuaArgument& CLuaArgument::operator=(const CLuaArgument& Argument) { - // Destroy our old string if neccessary + // Destroy our old string if necessary if (m_szString) { delete[] m_szString; diff --git a/Shared/sdk/RTree.h b/Shared/sdk/RTree.h index 3f662e4b1b8..b02aa52ca22 100644 --- a/Shared/sdk/RTree.h +++ b/Shared/sdk/RTree.h @@ -1021,7 +1021,7 @@ void RTREE_QUAL::DisconnectBranch(Node* a_node, int a_index) } // Pick a branch. Pick the one that will need the smallest increase -// in area to accomodate the new rectangle. This will result in the +// in area to accommodate the new rectangle. This will result in the // least total area for the covering rectangles in the current node. // In case of a tie, pick the one which was smaller before, to get // the best resolution when searching. diff --git a/Shared/sdk/SharedUtil.Tests.hpp b/Shared/sdk/SharedUtil.Tests.hpp index 7f727b34ef4..60f6bc0c72f 100644 --- a/Shared/sdk/SharedUtil.Tests.hpp +++ b/Shared/sdk/SharedUtil.Tests.hpp @@ -114,15 +114,15 @@ void SString_Tests() { TEST_FUNCTION std::vector parts; - source.Split(delim, parts, maxAmmount, minAmmount); + source.Split(delim, parts, maxAmount, minAmount); assert(parts.front() == resultFirst); assert(parts.back() == resultLast); assert(parts.size() == resultCount); TEST_VARS SString source; const char* delim; - uint maxAmmount; - uint minAmmount; + uint maxAmount; + uint minAmount; const char* resultFirst; const char* resultLast; uint resultCount; From ed4b2c06d476998a1b3f1b95b5088dc75a05f0bc Mon Sep 17 00:00:00 2001 From: Brophy <123881+Brophy@users.noreply.github.com> Date: Thu, 30 Apr 2026 11:45:17 +0100 Subject: [PATCH 3/3] Suggested changes --- Client/mods/deathmatch/logic/CClientPed.cpp | 10 +++++----- Client/mods/deathmatch/logic/CClientPed.h | 4 ++-- .../deathmatch/logic/CStaticFunctionDefinitions.cpp | 8 ++++---- .../mods/deathmatch/logic/CStaticFunctionDefinitions.h | 2 +- Client/mods/deathmatch/logic/luadefs/CLuaPedDefs.cpp | 8 ++++---- Client/mods/deathmatch/logic/rpc/CPedRPCs.cpp | 6 +++--- .../deathmatch/logic/CStaticFunctionDefinitions.cpp | 8 ++++---- .../mods/deathmatch/logic/CStaticFunctionDefinitions.h | 2 +- Shared/mods/deathmatch/logic/lua/CLuaOverloadParser.h | 2 +- 9 files changed, 25 insertions(+), 25 deletions(-) diff --git a/Client/mods/deathmatch/logic/CClientPed.cpp b/Client/mods/deathmatch/logic/CClientPed.cpp index 0bb55aef9a8..21dda2ee8b3 100644 --- a/Client/mods/deathmatch/logic/CClientPed.cpp +++ b/Client/mods/deathmatch/logic/CClientPed.cpp @@ -5794,7 +5794,7 @@ bool CClientPed::IsAnimationInProgress() } void CClientPed::RunNamedAnimation(std::unique_ptr& pBlock, const char* szAnimName, int iTime, int iBlend, bool bLoop, bool bUpdatePosition, - bool bInterruptable, bool bFreezeLastFrame, bool bRunInSequence, bool bOffsetPed, bool bHoldLastFrame) + bool bInterruptible, bool bFreezeLastFrame, bool bRunInSequence, bool bOffsetPed, bool bHoldLastFrame) { /* lil_Toady: this seems to break things // Kill any current animation that might be running @@ -5837,7 +5837,7 @@ void CClientPed::RunNamedAnimation(std::unique_ptr& pBlock, const ch } // Kill any higher priority tasks if we dont want this anim interruptible - if (!bInterruptable) + if (!bInterruptible) { KillTask(TASK_PRIORITY_PHYSICAL_RESPONSE); KillTask(TASK_PRIORITY_EVENT_RESPONSE_TEMP); @@ -5847,7 +5847,7 @@ void CClientPed::RunNamedAnimation(std::unique_ptr& pBlock, const ch if (!bFreezeLastFrame) flags |= 0x08; // flag determines whether to freeze player when anim ends. Really annoying (Maccer) float fBlendDelta = 1 / std::max((float)iBlend, 1.0f) * 1000; - CTask* pTask = g_pGame->GetTasks()->CreateTaskSimpleRunNamedAnim(szAnimName, pBlock->GetName(), flags, fBlendDelta, iTime, !bInterruptable, + CTask* pTask = g_pGame->GetTasks()->CreateTaskSimpleRunNamedAnim(szAnimName, pBlock->GetName(), flags, fBlendDelta, iTime, !bInterruptible, bRunInSequence, bOffsetPed, bHoldLastFrame); if (pTask) { @@ -5876,7 +5876,7 @@ void CClientPed::RunNamedAnimation(std::unique_ptr& pBlock, const ch m_AnimationCache.iBlend = iBlend; m_AnimationCache.bLoop = bLoop; m_AnimationCache.bUpdatePosition = bUpdatePosition; - m_AnimationCache.bInterruptable = bInterruptable; + m_AnimationCache.bInterruptible = bInterruptible; m_AnimationCache.bFreezeLastFrame = bFreezeLastFrame; } @@ -5921,7 +5921,7 @@ void CClientPed::RunAnimationFromCache() // Run our animation RunNamedAnimation(m_pAnimationBlock, animName.c_str(), m_AnimationCache.iTime, m_AnimationCache.iBlend, m_AnimationCache.bLoop, - m_AnimationCache.bUpdatePosition, m_AnimationCache.bInterruptable, m_AnimationCache.bFreezeLastFrame); + m_AnimationCache.bUpdatePosition, m_AnimationCache.bInterruptible, m_AnimationCache.bFreezeLastFrame); // Set anim progress & speed m_AnimationCache.progressWaitForStreamIn = true; diff --git a/Client/mods/deathmatch/logic/CClientPed.h b/Client/mods/deathmatch/logic/CClientPed.h index 8bab35d9849..53f52f2d1f5 100644 --- a/Client/mods/deathmatch/logic/CClientPed.h +++ b/Client/mods/deathmatch/logic/CClientPed.h @@ -141,7 +141,7 @@ struct SAnimationCache int iTime{-1}; bool bLoop{false}; bool bUpdatePosition{false}; - bool bInterruptable{false}; + bool bInterruptible{false}; bool bFreezeLastFrame{true}; int iBlend{250}; float progress{0.0f}; @@ -469,7 +469,7 @@ class CClientPed : public CClientStreamElement, public CAntiCheatModule bool IsAnimationInProgress(); void RunNamedAnimation(std::unique_ptr& pBlock, const char* szAnimName, int iTime = -1, int iBlend = 250, bool bLoop = true, - bool bUpdatePosition = true, bool bInterruptable = false, bool bFreezeLastFrame = true, bool bRunInSequence = false, + bool bUpdatePosition = true, bool bInterruptible = false, bool bFreezeLastFrame = true, bool bRunInSequence = false, bool bOffsetPed = false, bool bHoldLastFrame = false); void KillAnimation(); std::unique_ptr GetAnimationBlock(); diff --git a/Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp b/Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp index d960b2c84ba..dcd11a4e984 100644 --- a/Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp +++ b/Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp @@ -2249,9 +2249,9 @@ bool CStaticFunctionDefinitions::SetPedCanBeKnockedOffBike(CClientEntity& Entity } bool CStaticFunctionDefinitions::SetPedAnimation(CClientEntity& Entity, const SString& strBlockName, const char* szAnimName, int iTime, int iBlend, bool bLoop, - bool bUpdatePosition, bool bInterruptable, bool bFreezeLastFrame) + bool bUpdatePosition, bool bInterruptible, bool bFreezeLastFrame) { - RUN_CHILDREN(SetPedAnimation(**iter, strBlockName, szAnimName, iTime, iBlend, bLoop, bUpdatePosition, bInterruptable, bFreezeLastFrame)) + RUN_CHILDREN(SetPedAnimation(**iter, strBlockName, szAnimName, iTime, iBlend, bLoop, bUpdatePosition, bInterruptible, bFreezeLastFrame)) if (IS_PED(&Entity)) { @@ -2263,7 +2263,7 @@ bool CStaticFunctionDefinitions::SetPedAnimation(CClientEntity& Entity, const SS { Ped.SetCurrentAnimationCustom(false); Ped.SetNextAnimationNormal(); - Ped.RunNamedAnimation(pBlock, szAnimName, iTime, iBlend, bLoop, bUpdatePosition, bInterruptable, bFreezeLastFrame); + Ped.RunNamedAnimation(pBlock, szAnimName, iTime, iBlend, bLoop, bUpdatePosition, bInterruptible, bFreezeLastFrame); return true; } else @@ -2282,7 +2282,7 @@ bool CStaticFunctionDefinitions::SetPedAnimation(CClientEntity& Entity, const SS Ped.SetNextAnimationCustom(pIFP, szAnimName); const char* szGateWayAnimationName = g_pGame->GetAnimManager()->GetGateWayAnimationName(); - Ped.RunNamedAnimation(pBlock, szGateWayAnimationName, iTime, iBlend, bLoop, bUpdatePosition, bInterruptable, bFreezeLastFrame); + Ped.RunNamedAnimation(pBlock, szGateWayAnimationName, iTime, iBlend, bLoop, bUpdatePosition, bInterruptible, bFreezeLastFrame); return true; } } diff --git a/Client/mods/deathmatch/logic/CStaticFunctionDefinitions.h b/Client/mods/deathmatch/logic/CStaticFunctionDefinitions.h index 7aad71a2d7e..d1e019758e9 100644 --- a/Client/mods/deathmatch/logic/CStaticFunctionDefinitions.h +++ b/Client/mods/deathmatch/logic/CStaticFunctionDefinitions.h @@ -171,7 +171,7 @@ class CStaticFunctionDefinitions static bool SetPedRotation(CClientEntity& Entity, float fRotation, bool bNewWay); static bool SetPedCanBeKnockedOffBike(CClientEntity& Entity, bool bCanBeKnockedOffBike); static bool SetPedAnimation(CClientEntity& Entity, const SString& strBlockName, const char* szAnimName, int iTime, int iBlend, bool bLoop, - bool bUpdatePosition, bool bInterruptable, bool bFreezeLastFrame); + bool bUpdatePosition, bool bInterruptible, bool bFreezeLastFrame); static bool SetPedAnimationProgress(CClientEntity& Entity, const SString& strAnimName, float fProgress); static bool SetPedAnimationSpeed(CClientEntity& Entity, const SString& strAnimName, float fSpeed); diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaPedDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaPedDefs.cpp index 450214d624f..6e63a612d8f 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaPedDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaPedDefs.cpp @@ -1439,7 +1439,7 @@ int CLuaPedDefs::GetPedAnimation(lua_State* luaVM) lua_setfield(luaVM, -2, "loop"); lua_pushboolean(luaVM, animationCache.bUpdatePosition); lua_setfield(luaVM, -2, "updatePosition"); - lua_pushboolean(luaVM, animationCache.bInterruptable); + lua_pushboolean(luaVM, animationCache.bInterruptible); lua_setfield(luaVM, -2, "interruptable"); lua_pushboolean(luaVM, animationCache.bFreezeLastFrame); lua_setfield(luaVM, -2, "freezeLastFrame"); @@ -2235,7 +2235,7 @@ int CLuaPedDefs::SetPedAnimation(lua_State* luaVM) int iBlend = 250; bool bLoop = true; bool bUpdatePosition = true; - bool bInterruptable = true; + bool bInterruptible = true; bool bFreezeLastFrame = true; bool bTaskToBeRestoredOnAnimEnd = false; @@ -2251,7 +2251,7 @@ int CLuaPedDefs::SetPedAnimation(lua_State* luaVM) argStream.ReadNumber(iTime, -1); argStream.ReadBool(bLoop, true); argStream.ReadBool(bUpdatePosition, true); - argStream.ReadBool(bInterruptable, true); + argStream.ReadBool(bInterruptible, true); argStream.ReadBool(bFreezeLastFrame, true); argStream.ReadNumber(iBlend, 250); argStream.ReadBool(bTaskToBeRestoredOnAnimEnd, false); @@ -2259,7 +2259,7 @@ int CLuaPedDefs::SetPedAnimation(lua_State* luaVM) if (!argStream.HasErrors()) { if (CStaticFunctionDefinitions::SetPedAnimation(*pEntity, strBlockName == "" ? NULL : strBlockName.c_str(), - strAnimName == "" ? NULL : strAnimName.c_str(), iTime, iBlend, bLoop, bUpdatePosition, bInterruptable, + strAnimName == "" ? NULL : strAnimName.c_str(), iTime, iBlend, bLoop, bUpdatePosition, bInterruptible, bFreezeLastFrame)) { CClientPed* pPed = static_cast(pEntity); diff --git a/Client/mods/deathmatch/logic/rpc/CPedRPCs.cpp b/Client/mods/deathmatch/logic/rpc/CPedRPCs.cpp index 00ab607e11e..7b4b1af19e9 100644 --- a/Client/mods/deathmatch/logic/rpc/CPedRPCs.cpp +++ b/Client/mods/deathmatch/logic/rpc/CPedRPCs.cpp @@ -255,10 +255,10 @@ void CPedRPCs::SetPedAnimation(CClientEntity* pSource, NetBitStreamInterface& bi std::string animName; int iTime; int iBlend = 250; - bool bLoop, bUpdatePosition, bInterruptable, bFreezeLastFrame, bTaskToBeRestoredOnAnimEnd; + bool bLoop, bUpdatePosition, bInterruptible, bFreezeLastFrame, bTaskToBeRestoredOnAnimEnd; if (bitStream.ReadString(animName) && bitStream.Read(iTime) && bitStream.ReadBit(bLoop) && bitStream.ReadBit(bUpdatePosition) && - bitStream.ReadBit(bInterruptable) && bitStream.ReadBit(bFreezeLastFrame)) + bitStream.ReadBit(bInterruptible) && bitStream.ReadBit(bFreezeLastFrame)) { bitStream.Read(iBlend); bitStream.ReadBit(bTaskToBeRestoredOnAnimEnd); @@ -270,7 +270,7 @@ void CPedRPCs::SetPedAnimation(CClientEntity* pSource, NetBitStreamInterface& bi std::unique_ptr pBlock = g_pGame->GetAnimManager()->GetAnimationBlock(blockName.c_str()); if (pBlock) { - pPed->RunNamedAnimation(pBlock, animName.c_str(), iTime, iBlend, bLoop, bUpdatePosition, bInterruptable, bFreezeLastFrame); + pPed->RunNamedAnimation(pBlock, animName.c_str(), iTime, iBlend, bLoop, bUpdatePosition, bInterruptible, bFreezeLastFrame); pPed->SetTaskToBeRestoredOnAnimEnd(bTaskToBeRestoredOnAnimEnd); pPed->SetTaskTypeToBeRestoredOnAnimEnd((eTaskType)TASK_SIMPLE_DUCK); diff --git a/Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp b/Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp index 9b0572f9165..7bcd5afe321 100644 --- a/Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp +++ b/Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp @@ -4490,11 +4490,11 @@ bool CStaticFunctionDefinitions::SetPedDoingGangDriveby(CElement* pElement, bool } bool CStaticFunctionDefinitions::SetPedAnimation(CElement* pElement, const SString& blockName, const SString& animName, int iTime, int iBlend, bool bLoop, - bool bUpdatePosition, bool bInterruptable, bool bFreezeLastFrame, bool bTaskToBeRestoredOnAnimEnd) + bool bUpdatePosition, bool bInterruptible, bool bFreezeLastFrame, bool bTaskToBeRestoredOnAnimEnd) { assert(pElement); RUN_CHILDREN( - SetPedAnimation(*iter, blockName, animName, iTime, iBlend, bLoop, bUpdatePosition, bInterruptable, bFreezeLastFrame, bTaskToBeRestoredOnAnimEnd)) + SetPedAnimation(*iter, blockName, animName, iTime, iBlend, bLoop, bUpdatePosition, bInterruptible, bFreezeLastFrame, bTaskToBeRestoredOnAnimEnd)) if (IS_PED(pElement)) { @@ -4514,7 +4514,7 @@ bool CStaticFunctionDefinitions::SetPedAnimation(CElement* pElement, const SStri pPed->SetChoking(false); // Store anim data - pPed->SetAnimationData(SPlayerAnimData{blockName, animName, iTime, bLoop, bUpdatePosition, bInterruptable, bFreezeLastFrame, iBlend, + pPed->SetAnimationData(SPlayerAnimData{blockName, animName, iTime, bLoop, bUpdatePosition, bInterruptible, bFreezeLastFrame, iBlend, bTaskToBeRestoredOnAnimEnd, GetTickCount64_()}); BitStream.pBitStream->WriteString(blockName); @@ -4522,7 +4522,7 @@ bool CStaticFunctionDefinitions::SetPedAnimation(CElement* pElement, const SStri BitStream.pBitStream->Write(iTime); BitStream.pBitStream->WriteBit(bLoop); BitStream.pBitStream->WriteBit(bUpdatePosition); - BitStream.pBitStream->WriteBit(bInterruptable); + BitStream.pBitStream->WriteBit(bInterruptible); BitStream.pBitStream->WriteBit(bFreezeLastFrame); BitStream.pBitStream->Write(iBlend); BitStream.pBitStream->WriteBit(bTaskToBeRestoredOnAnimEnd); diff --git a/Server/mods/deathmatch/logic/CStaticFunctionDefinitions.h b/Server/mods/deathmatch/logic/CStaticFunctionDefinitions.h index 16c9cbab65e..911710b06b4 100644 --- a/Server/mods/deathmatch/logic/CStaticFunctionDefinitions.h +++ b/Server/mods/deathmatch/logic/CStaticFunctionDefinitions.h @@ -217,7 +217,7 @@ class CStaticFunctionDefinitions static bool RemovePedFromVehicle(CElement* pElement); static bool SetPedDoingGangDriveby(CElement* pElement, bool bGangDriveby); static bool SetPedAnimation(CElement* pElement, const SString& blockName, const SString& animName, int iTime, int iBlend, bool bLoop, bool bUpdatePosition, - bool bInterruptable, bool bFreezeLastFrame, bool bTaskToBeRestoredOnAnimEnd); + bool bInterruptible, bool bFreezeLastFrame, bool bTaskToBeRestoredOnAnimEnd); static bool SetPedAnimationProgress(CElement* pElement, const SString& animName, float fProgress); static bool SetPedAnimationSpeed(CElement* pElement, const SString& animName, float fSpeed); static bool SetPedOnFire(CElement* pElement, bool bIsOnFire); diff --git a/Shared/mods/deathmatch/logic/lua/CLuaOverloadParser.h b/Shared/mods/deathmatch/logic/lua/CLuaOverloadParser.h index c9032926bd0..639f70460e5 100644 --- a/Shared/mods/deathmatch/logic/lua/CLuaOverloadParser.h +++ b/Shared/mods/deathmatch/logic/lua/CLuaOverloadParser.h @@ -54,7 +54,7 @@ struct CLuaOverloadParser } } - // Chose an overload that the Nth parameter matches + // Choose an overload that the Nth parameter matches template static ChosenFunction MakeChoice(std::variant var) {