Apply win-apply-clang-format.bat

multitheftauto · Jun 12, 2023 · 6f26c2a · 6f26c2a
1 parent 39ccaef
commit 6f26c2a
Show file tree

Hide file tree

Showing 29 changed files with 115 additions and 115 deletions.
diff --git a/Client/core/CLanguageSelector.cpp b/Client/core/CLanguageSelector.cpp
@@ -257,8 +257,7 @@ void CLanguageSelector::DoPulse()
             pItem->fFocusEffectPos += Clamp(-fMaxAmount, pItem->fFocusEffectTarget - pItem->fFocusEffectPos, fMaxAmount);
 
             // Move label
-            CVector2D vecLabelZoomPos =
-                pItem->vecLabelInitialPos + CVector2D(pItem->vecLabelInitialSize.fX * pItem->fFocusEffectPos * 0.05f, 0);
+            CVector2D vecLabelZoomPos = pItem->vecLabelInitialPos + CVector2D(pItem->vecLabelInitialSize.fX * pItem->fFocusEffectPos * 0.05f, 0);
             pItem->pLabel->SetPosition(vecLabelZoomPos);
         }
     }

diff --git a/Client/core/Graphics/CTileBatcher.cpp b/Client/core/Graphics/CTileBatcher.cpp
@@ -280,7 +280,7 @@ void CTileBatcher::AddTile(float fX1, float fY1, float fX2, float fY2, float fU1
 
     uint uiTessellationX = 1;
     uint uiTessellationY = 1;
-    bool bUseCustomMatrices{ false };
+    bool bUseCustomMatrices{false};
 
     // Get settings from shader
     if (CShaderInstance* pShaderInstance = DynamicCast<CShaderInstance>(pMaterial))

diff --git a/Client/game_sa/CRenderWareSA.ShaderSupport.h b/Client/game_sa/CRenderWareSA.ShaderSupport.h
@@ -14,9 +14,9 @@
 #include "CRenderWareSA.h"
 
 #ifdef MTA_DEBUG
-    // Comment out the lines below for your desired debug options
-    // #define SHADER_DEBUG_CHECKS         // Do lots of validation which can slow a debug build
-    // #define SHADER_DEBUG_OUTPUT         // Output lots of debug strings
+// Comment out the lines below for your desired debug options
+// #define SHADER_DEBUG_CHECKS         // Do lots of validation which can slow a debug build
+// #define SHADER_DEBUG_OUTPUT         // Output lots of debug strings
 #endif
 
 // Various dodgy pointer values

diff --git a/Client/mods/deathmatch/ClientCommands.h b/Client/mods/deathmatch/ClientCommands.h
@@ -46,7 +46,7 @@ void COMMAND_ServerInfo(const char* szCmdLine);
 // DISABLE THESE BEFORE RELEASE
 #ifdef MTA_DEBUG
 void COMMAND_ShowSyncData(const char* szCmdLine);
-    // void COMMAND_DumpPlayers            ( const char* szCmdLine );
+// void COMMAND_DumpPlayers            ( const char* szCmdLine );
 #endif
 
 #if defined(MTA_DEBUG) || defined(MTA_BETA)

diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaDrawingDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaDrawingDefs.cpp
@@ -1729,25 +1729,25 @@ int CLuaDrawingDefs::DxGetStatus(lua_State* luaVM)
         lua_settable(luaVM, -3);
 
         lua::Push(luaVM, "SettingDebugMode");
-        lua::Push(luaVM, []{
+        lua::Push(luaVM, [] {
             switch (g_pCore->GetDiagnosticDebug())
             {
-            case EDiagnosticDebug::GRAPHICS_6734:
-                return "#6734 Graphics";
-            case EDiagnosticDebug::D3D_6732:
-                return "#6732 D3D";
-            case EDiagnosticDebug::LOG_TIMING_0000:
-                return "#0000 Log timing";
-            case EDiagnosticDebug::JOYSTICK_0000:
-                return "#0000 Joystick";
-            case EDiagnosticDebug::LUA_TRACE_0000:
-                return "#0000 Lua trace";
-            case EDiagnosticDebug::RESIZE_ALWAYS_0000:
-                return "#0000 Resize always";
-            case EDiagnosticDebug::RESIZE_NEVER_0000:
-                return "#0000 Resize never";
-            default:
-                return "Default";
+                case EDiagnosticDebug::GRAPHICS_6734:
+                    return "#6734 Graphics";
+                case EDiagnosticDebug::D3D_6732:
+                    return "#6732 D3D";
+                case EDiagnosticDebug::LOG_TIMING_0000:
+                    return "#0000 Log timing";
+                case EDiagnosticDebug::JOYSTICK_0000:
+                    return "#0000 Joystick";
+                case EDiagnosticDebug::LUA_TRACE_0000:
+                    return "#0000 Lua trace";
+                case EDiagnosticDebug::RESIZE_ALWAYS_0000:
+                    return "#0000 Resize always";
+                case EDiagnosticDebug::RESIZE_NEVER_0000:
+                    return "#0000 Resize never";
+                default:
+                    return "Default";
             }
         }());
         lua_settable(luaVM, -3);

diff --git a/Client/sdk/game/CStreaming.h b/Client/sdk/game/CStreaming.h
@@ -43,5 +43,5 @@ class CStreaming
     virtual uint32 GetStreamingBufferSize() = 0;
     virtual void   MakeSpaceFor(std::uint32_t memoryToCleanInBytes) = 0;
     virtual std::uint32_t GetMemoryUsed() const = 0;
-    virtual void            RemoveBigBuildings() = 0;
+    virtual void          RemoveBigBuildings() = 0;
 };
diff --git a/Client/sdk/ijsify.h b/Client/sdk/ijsify.h
@@ -81,45 +81,45 @@ extern DWORD* g_Table;
 extern DWORD* g_TableSize;
 extern DWORD  g_dwTable;
 
-    /*
-    inline void* __cdecl operator new ( unsigned int uiSize )
-    {
-        DWORD dwOld, dwData;
+/*
+inline void* __cdecl operator new ( unsigned int uiSize )
+{
+    DWORD dwOld, dwData;
 
-        if ( !g_bBoundsChecker ) {
-            dwData = (DWORD)HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, uiSize);
-            VirtualProtect ( (void*)dwData, uiSize, PAGE_EXECUTE_READWRITE, &dwOld );
-            return (void*)dwData;
-        }
-        // define the guard bytes
-        DWORD dwGuardBegin = 0xBEEFFDFD;
-        WORD wGuardEnd = 0xDEAC;
+    if ( !g_bBoundsChecker ) {
+        dwData = (DWORD)HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, uiSize);
+        VirtualProtect ( (void*)dwData, uiSize, PAGE_EXECUTE_READWRITE, &dwOld );
+        return (void*)dwData;
+    }
+    // define the guard bytes
+    DWORD dwGuardBegin = 0xBEEFFDFD;
+    WORD wGuardEnd = 0xDEAC;
 
-        // allocate ( size + 4 (begin) + 2 (end) )
-        dwData = (DWORD) HeapAlloc ( GetProcessHeap (), HEAP_ZERO_MEMORY, uiSize + 6 );
+    // allocate ( size + 4 (begin) + 2 (end) )
+    dwData = (DWORD) HeapAlloc ( GetProcessHeap (), HEAP_ZERO_MEMORY, uiSize + 6 );
 
-        // [0   -> 4]       insert begin guard bytes
-        memcpy ( (void*)(dwData), &dwGuardBegin, 4 );
-        uiSize += 4;
+    // [0   -> 4]       insert begin guard bytes
+    memcpy ( (void*)(dwData), &dwGuardBegin, 4 );
+    uiSize += 4;
 
-        // [x   -> x+2]     insert end guard bytes
-        memcpy ( (void*)(dwData + uiSize), &wGuardEnd, 2 );
-        uiSize += 2;
+    // [x   -> x+2]     insert end guard bytes
+    memcpy ( (void*)(dwData + uiSize), &wGuardEnd, 2 );
+    uiSize += 2;
 
-        // set guard protection state
-        VirtualProtect ( (void*)dwData, uiSize, PAGE_EXECUTE_READWRITE | PAGE_GUARD, &dwOld );
+    // set guard protection state
+    VirtualProtect ( (void*)dwData, uiSize, PAGE_EXECUTE_READWRITE | PAGE_GUARD, &dwOld );
 
-        g_Table[g_dwTable]          = dwData;
-        g_TableSize[g_dwTable++]    = (DWORD)uiSize;
+    g_Table[g_dwTable]          = dwData;
+    g_TableSize[g_dwTable++]    = (DWORD)uiSize;
 
-        // and return the correct data pointer
-        return (void*)( dwData + 4 );
+    // and return the correct data pointer
+    return (void*)( dwData + 4 );
 
-    };
+};
 
-    inline void __cdecl operator delete ( void* pData )
-    {
-        HeapFree ( GetProcessHeap(), 0, pData );
-    };
-    */
+inline void __cdecl operator delete ( void* pData )
+{
+    HeapFree ( GetProcessHeap(), 0, pData );
+};
+*/
 #endif
diff --git a/Server/core/CCrashHandler.cpp b/Server/core/CCrashHandler.cpp
@@ -142,7 +142,7 @@ inline __attribute__((always_inline)) static void SaveBacktraceSummary()
     }
 }
 
-    // Linux/Mac crash callback when using google-breakpad
+// Linux/Mac crash callback when using google-breakpad
 #ifdef __APPLE__
 bool DumpCallback(const char* dump_dir, const char* minidump_id, void* context, bool succeeded)
 {

diff --git a/Server/core/CCrashHandlerAPI.cpp b/Server/core/CCrashHandlerAPI.cpp
@@ -46,11 +46,11 @@ static LPTOP_LEVEL_EXCEPTION_FILTER g_pfnOrigFilt = NULL;
 // The exception handler
 LONG __stdcall CrashHandlerExceptionFilter(EXCEPTION_POINTERS* pExPtrs);
 
-    /*//////////////////////////////////////////////////////////////////////
-                                Destructor Class
-    //////////////////////////////////////////////////////////////////////*/
-    // See the note in MEMDUMPVALIDATOR.CPP about automatic classes.
-    // Turn off warning : initializers put in library initialization area
+/*//////////////////////////////////////////////////////////////////////
+                            Destructor Class
+//////////////////////////////////////////////////////////////////////*/
+// See the note in MEMDUMPVALIDATOR.CPP about automatic classes.
+// Turn off warning : initializers put in library initialization area
 #pragma warning (disable : 4073)
 #pragma init_seg(lib)
 class CleanUpCrashHandler

diff --git a/Server/core/Server.cpp b/Server/core/Server.cpp
@@ -16,7 +16,7 @@
 #include "SharedUtil.hpp"
 #include "ErrorCodes.h"
 #ifdef WIN_x86
-    // TODO - 64 bit file hooks
+// TODO - 64 bit file hooks
     #include "SharedUtil.Win32Utf8FileHooks.hpp"
 #endif
 

diff --git a/Server/core/StdInc.h b/Server/core/StdInc.h
@@ -13,22 +13,22 @@
 #include <string>
 
 #ifndef WIN32
-    // Linux allocation tracking doesn't work in this module for some reason
+// Linux allocation tracking doesn't work in this module for some reason
     #define WITH_ALLOC_TRACKING 0
 #endif
 #include "SharedUtil.h"
 
 #ifdef WIN32
-    //
-    // Windows
-    //
+//
+// Windows
+//
     #include <conio.h>
     #include <direct.h>
     #include <windows.h>
 #else
-    //
-    // POSIX
-    //
+//
+// POSIX
+//
     #include <stdlib.h>
     #include <unistd.h>
     #include <fcntl.h>

diff --git a/Server/dbconmy/StdInc.h b/Server/dbconmy/StdInc.h
@@ -24,9 +24,9 @@
 #include <MTAPlatform.h>
 
 #ifdef WIN32
-    //
-    // Windows
-    //
+//
+// Windows
+//
     #include <windows.h>
     #include <mmsystem.h>
 #endif
diff --git a/Server/launcher/Main.cpp b/Server/launcher/Main.cpp
@@ -26,7 +26,7 @@
 #include "SharedUtil.h"
 
 #ifdef WIN32
-    // Linux gcc 4.4.5 memory corruption on destruction of g_StatEvents (Reason unknown)
+// Linux gcc 4.4.5 memory corruption on destruction of g_StatEvents (Reason unknown)
     #include "SharedUtil.hpp"
 #else
     #include <unistd.h>

diff --git a/Server/mods/deathmatch/StdInc.h b/Server/mods/deathmatch/StdInc.h
@@ -27,9 +27,9 @@
 #include "MTAPlatform.h"
 
 #ifdef WIN32
-    //
-    // Windows
-    //
+//
+// Windows
+//
     #include <winsock2.h>
     #include <windows.h>
     #include <mmsystem.h>

diff --git a/Server/mods/deathmatch/logic/CPed.h b/Server/mods/deathmatch/logic/CPed.h
@@ -269,11 +269,11 @@ class CPed : public CElement
     void SetCollisionEnabled(bool bCollisionEnabled) { m_bCollisionsEnabled = bCollisionEnabled; }
 
     long long GetLastFarSyncTick() { return m_llLastFarSyncTick; }
-    void SetLastFarSyncTick(long long llLastSyncTick) { m_llLastFarSyncTick = llLastSyncTick; }
+    void      SetLastFarSyncTick(long long llLastSyncTick) { m_llLastFarSyncTick = llLastSyncTick; }
 
-    void ClearNearPlayersList() { m_nearPlayersList.clear(); }
-    void AddPlayerToNearList(CPlayer* pPlayer) { m_nearPlayersList.push_back(pPlayer); }
-    bool IsNearPlayersListEmpty() { return m_nearPlayersList.empty(); }
+    void                                  ClearNearPlayersList() { m_nearPlayersList.clear(); }
+    void                                  AddPlayerToNearList(CPlayer* pPlayer) { m_nearPlayersList.push_back(pPlayer); }
+    bool                                  IsNearPlayersListEmpty() { return m_nearPlayersList.empty(); }
     std::vector<CPlayer*>::const_iterator NearPlayersIterBegin() { return m_nearPlayersList.begin(); }
     std::vector<CPlayer*>::const_iterator NearPlayersIterEnd() { return m_nearPlayersList.end(); }
 

diff --git a/Server/mods/deathmatch/logic/CPedSync.cpp b/Server/mods/deathmatch/logic/CPedSync.cpp
@@ -111,17 +111,17 @@ void CPedSync::UpdateSyncer(CPed* pPed)
     if (pSyncer)
     {
         // Is he close enough, and in the right dimension?
-        if (IsSyncerPersistent() || (pPed->GetDimension() == pSyncer->GetDimension()
-            && IsPointNearPoint3D(pSyncer->GetPosition(), pPed->GetPosition(), (float)g_TickRateSettings.iPedSyncerDistance)))
-                return;
+        if (IsSyncerPersistent() || (pPed->GetDimension() == pSyncer->GetDimension() &&
+                                     IsPointNearPoint3D(pSyncer->GetPosition(), pPed->GetPosition(), (float)g_TickRateSettings.iPedSyncerDistance)))
+            return;
 
         // Stop him from syncing it
         StopSync(pPed);
     }
 
     if (pPed->IsBeingDeleted())
         return;
-            
+
     // Find a new syncer for it
     FindSyncer(pPed);
 }
@@ -348,7 +348,7 @@ void CPedSync::UpdateNearPlayersList()
 
             // Check distance accurately because the spatial database is 2D
             if ((vecCameraPosition - pPed->GetPosition()).LengthSquared() < DISTANCE_FOR_NEAR_VIEWER * DISTANCE_FOR_NEAR_VIEWER)
-                pPed->AddPlayerToNearList(pPlayer); 
+                pPed->AddPlayerToNearList(pPlayer);
         }
     }
 }
diff --git a/Server/mods/deathmatch/logic/CUnoccupiedVehicleSync.cpp b/Server/mods/deathmatch/logic/CUnoccupiedVehicleSync.cpp
@@ -131,7 +131,8 @@ void CUnoccupiedVehicleSync::UpdateVehicle(CVehicle* pVehicle)
         if (pSyncer)
         {
             // He isn't close enough to the vehicle and in the right dimension?
-            if (!IsSyncerPersistent() && (!IsPointNearPoint3D(pSyncer->GetPosition(), pVehicle->GetPosition(), (float)g_TickRateSettings.iUnoccupiedVehicleSyncerDistance)) ||
+            if (!IsSyncerPersistent() &&
+                    (!IsPointNearPoint3D(pSyncer->GetPosition(), pVehicle->GetPosition(), (float)g_TickRateSettings.iUnoccupiedVehicleSyncerDistance)) ||
                 (pVehicle->GetDimension() != pSyncer->GetDimension()))
             {
                 // Stop him from syncing it
@@ -497,7 +498,7 @@ void CUnoccupiedVehicleSync::Packet_UnoccupiedVehiclePushSync(CUnoccupiedVehicle
                     {
                         OverrideSyncer(pVehicle, pPlayer);
                     }
-                    
+
                     // Reset our push time
                     pVehicle->ResetLastPushTime();
                 }

diff --git a/Server/sdk/MTAPlatform.h b/Server/sdk/MTAPlatform.h
@@ -57,7 +57,7 @@ extern "C" bool g_bNoTopBar;
 // Define types
 typedef int socklen_t;
 
-    // Define keys
+// Define keys
     #define KEY_BACKSPACE 0x08
     #define KEY_EXTENDED  0xE0
     #define KEY_LEFT      0x4B

diff --git a/Shared/mods/deathmatch/logic/CLatentTransferManager.cpp b/Shared/mods/deathmatch/logic/CLatentTransferManager.cpp
@@ -90,7 +90,7 @@ void CLatentTransferManager::RemoveRemote(NetPlayerID remoteId)
     MapRemove(m_SendQueueMap, remoteId);
 
     SAFE_DELETE(pSendQueue);
-    
+
     if (pReceiver && pReceiver->IsInside())
         pReceiver->SetDeferredDelete();
     else

diff --git a/Shared/mods/deathmatch/logic/CLatentTransferManager.h b/Shared/mods/deathmatch/logic/CLatentTransferManager.h
@@ -142,6 +142,7 @@ class CLatentSendQueue
 class CLatentReceiver
 {
     friend struct SScopedGuardInsideMark;
+
 public:
     ZERO_ON_NEW
     CLatentReceiver(NetPlayerID remoteId, ushort usBitStreamVersion);

diff --git a/Shared/mods/deathmatch/logic/lua/CLuaFunctionParser.h b/Shared/mods/deathmatch/logic/lua/CLuaFunctionParser.h
@@ -439,9 +439,9 @@ struct CLuaFunctionParserBase
                     continue;
                 }
 
-                int i = -2;
-                auto        k = PopUnsafe<key_t>(L, i);
-                auto        v = PopUnsafe<value_t>(L, i);
+                int  i = -2;
+                auto k = PopUnsafe<key_t>(L, i);
+                auto v = PopUnsafe<value_t>(L, i);
                 map.emplace(std::move(k), std::move(v));
                 lua_pop(L, 1);            // drop value, keep key for lua_next
             }

diff --git a/Shared/publicsdk/Common.h b/Shared/publicsdk/Common.h
@@ -38,7 +38,7 @@ using namespace std;
 #ifndef __COMMON_H
 #define __COMMON_H
 
-    // used in the function argument vector
+// used in the function argument vector
 #define MAX_ARGUMENTS 10
 struct FunctionArguments
 {

diff --git a/Shared/sdk/RTree.h b/Shared/sdk/RTree.h
@@ -46,9 +46,9 @@ o Minor updates for MSVC 2005/08 compilers
 #ifndef RTREE_H
 #define RTREE_H
 
-    // NOTE This file compiles under MSVC 6 SP5 and MSVC .Net 2003 it may not work on other compilers without modification.
+// NOTE This file compiles under MSVC 6 SP5 and MSVC .Net 2003 it may not work on other compilers without modification.
 
-    // NOTE These next few lines may be win32 specific, you may need to modify them to compile on other platform
+// NOTE These next few lines may be win32 specific, you may need to modify them to compile on other platform
 #include <stdio.h>
 #include <math.h>
 #include <stdlib.h>