Skip to content

Commit d5b9a56

Browse files
patrikjuvonenpatrikjuvonen
committed
Addendum to 25d9ba3: Run clang-format again
1 parent 4321a8e commit d5b9a56

File tree

16 files changed

+65
-65
lines changed

16 files changed

+65
-65
lines changed

‎Client/game_sa/CRenderWareSA.ShaderSupport.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
*****************************************************************************/
1111

1212
#ifdef MTA_DEBUG
13-
// Comment out the lines below for your desired debug options
14-
//#define SHADER_DEBUG_CHECKS // Do lots of validation which can slow a debug build
15-
//#define SHADER_DEBUG_OUTPUT // Output lots of debug strings
13+
// Comment out the lines below for your desired debug options
14+
//#define SHADER_DEBUG_CHECKS // Do lots of validation which can slow a debug build
15+
//#define SHADER_DEBUG_OUTPUT // Output lots of debug strings
1616
#endif
1717

1818
// Various dodgy pointer values

‎Client/mods/deathmatch/ClientCommands.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ void COMMAND_ServerInfo(const char* szCmdLine);
4646
// DISABLE THESE BEFORE RELEASE
4747
#ifdef MTA_DEBUG
4848
void COMMAND_ShowSyncData(const char* szCmdLine);
49-
// void COMMAND_DumpPlayers ( const char* szCmdLine );
49+
// void COMMAND_DumpPlayers ( const char* szCmdLine );
5050
#endif
5151

5252
#if defined(MTA_DEBUG) || defined(MTA_BETA)

‎Client/sdk/ijsify.h

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -81,45 +81,45 @@ extern DWORD* g_Table;
8181
extern DWORD* g_TableSize;
8282
extern DWORD g_dwTable;
8383

84-
/*
85-
inline void* __cdecl operator new ( unsigned int uiSize )
86-
{
87-
DWORD dwOld, dwData;
84+
/*
85+
inline void* __cdecl operator new ( unsigned int uiSize )
86+
{
87+
DWORD dwOld, dwData;
8888
89-
if ( !g_bBoundsChecker ) {
90-
dwData = (DWORD)HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, uiSize);
91-
VirtualProtect ( (void*)dwData, uiSize, PAGE_EXECUTE_READWRITE, &dwOld );
92-
return (void*)dwData;
93-
}
94-
// define the guard bytes
95-
DWORD dwGuardBegin = 0xBEEFFDFD;
96-
WORD wGuardEnd = 0xDEAC;
89+
if ( !g_bBoundsChecker ) {
90+
dwData = (DWORD)HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, uiSize);
91+
VirtualProtect ( (void*)dwData, uiSize, PAGE_EXECUTE_READWRITE, &dwOld );
92+
return (void*)dwData;
93+
}
94+
// define the guard bytes
95+
DWORD dwGuardBegin = 0xBEEFFDFD;
96+
WORD wGuardEnd = 0xDEAC;
9797
98-
// allocate ( size + 4 (begin) + 2 (end) )
99-
dwData = (DWORD) HeapAlloc ( GetProcessHeap (), HEAP_ZERO_MEMORY, uiSize + 6 );
98+
// allocate ( size + 4 (begin) + 2 (end) )
99+
dwData = (DWORD) HeapAlloc ( GetProcessHeap (), HEAP_ZERO_MEMORY, uiSize + 6 );
100100
101-
// [0 -> 4] insert begin guard bytes
102-
memcpy ( (void*)(dwData), &dwGuardBegin, 4 );
103-
uiSize += 4;
101+
// [0 -> 4] insert begin guard bytes
102+
memcpy ( (void*)(dwData), &dwGuardBegin, 4 );
103+
uiSize += 4;
104104
105-
// [x -> x+2] insert end guard bytes
106-
memcpy ( (void*)(dwData + uiSize), &wGuardEnd, 2 );
107-
uiSize += 2;
105+
// [x -> x+2] insert end guard bytes
106+
memcpy ( (void*)(dwData + uiSize), &wGuardEnd, 2 );
107+
uiSize += 2;
108108
109-
// set guard protection state
110-
VirtualProtect ( (void*)dwData, uiSize, PAGE_EXECUTE_READWRITE | PAGE_GUARD, &dwOld );
109+
// set guard protection state
110+
VirtualProtect ( (void*)dwData, uiSize, PAGE_EXECUTE_READWRITE | PAGE_GUARD, &dwOld );
111111
112-
g_Table[g_dwTable] = dwData;
113-
g_TableSize[g_dwTable++] = (DWORD)uiSize;
112+
g_Table[g_dwTable] = dwData;
113+
g_TableSize[g_dwTable++] = (DWORD)uiSize;
114114
115-
// and return the correct data pointer
116-
return (void*)( dwData + 4 );
115+
// and return the correct data pointer
116+
return (void*)( dwData + 4 );
117117
118-
};
118+
};
119119
120-
inline void __cdecl operator delete ( void* pData )
121-
{
122-
HeapFree ( GetProcessHeap(), 0, pData );
123-
};
124-
*/
120+
inline void __cdecl operator delete ( void* pData )
121+
{
122+
HeapFree ( GetProcessHeap(), 0, pData );
123+
};
124+
*/
125125
#endif

‎Server/core/CCrashHandler.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ inline __attribute__((always_inline)) static void SaveBacktraceSummary()
139139
}
140140
}
141141

142-
// Linux/Mac crash callback when using google-breakpad
142+
// Linux/Mac crash callback when using google-breakpad
143143
#ifdef __APPLE__
144144
bool DumpCallback(const char* dump_dir, const char* minidump_id, void* context, bool succeeded)
145145
{

‎Server/core/CCrashHandlerAPI.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@ static LPTOP_LEVEL_EXCEPTION_FILTER g_pfnOrigFilt = NULL;
4646
// The exception handler
4747
LONG __stdcall CrashHandlerExceptionFilter(EXCEPTION_POINTERS* pExPtrs);
4848

49-
/*//////////////////////////////////////////////////////////////////////
50-
Destructor Class
51-
//////////////////////////////////////////////////////////////////////*/
52-
// See the note in MEMDUMPVALIDATOR.CPP about automatic classes.
53-
// Turn off warning : initializers put in library initialization area
49+
/*//////////////////////////////////////////////////////////////////////
50+
Destructor Class
51+
//////////////////////////////////////////////////////////////////////*/
52+
// See the note in MEMDUMPVALIDATOR.CPP about automatic classes.
53+
// Turn off warning : initializers put in library initialization area
5454
#pragma warning (disable : 4073)
5555
#pragma init_seg(lib)
5656
class CleanUpCrashHandler

‎Server/core/Server.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include "SharedUtil.hpp"
1616
#include "ErrorCodes.h"
1717
#ifdef WIN_x86
18-
// TODO - 64 bit file hooks
18+
// TODO - 64 bit file hooks
1919
#include "SharedUtil.Win32Utf8FileHooks.hpp"
2020
#endif
2121

‎Server/core/StdInc.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
#include "MTAPlatform.h"
1515
#ifndef WIN32
16-
// Linux allocation tracking doesn't work in this module for some reason
16+
// Linux allocation tracking doesn't work in this module for some reason
1717
#define WITH_ALLOC_TRACKING 0
1818
#endif
1919
#include "SharedUtil.h"

‎Server/launcher/Main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include "MTAPlatform.h"
2626
#include "SharedUtil.h"
2727
#ifdef WIN32
28-
// Linux gcc 4.4.5 memory corruption on destruction of g_StatEvents (Reason unknown)
28+
// Linux gcc 4.4.5 memory corruption on destruction of g_StatEvents (Reason unknown)
2929
#include "SharedUtil.hpp"
3030
#else
3131
FILE* SharedUtil::File::Fopen(const char* szFilename, const char* szMode)

‎Server/sdk/MTAPlatform.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,27 +47,27 @@ extern "C" bool g_bNoTopBar;
4747

4848
/** Multi-platform defines **/
4949
#ifdef WIN32
50-
/* Win32 */
50+
/* Win32 */
5151

52-
// Define includes
52+
// Define includes
5353
#include <conio.h>
5454
#include <direct.h>
5555
#include <windows.h>
5656

5757
// Define types
5858
typedef int socklen_t;
5959

60-
// Define keys
60+
// Define keys
6161
#define KEY_BACKSPACE 0x08
6262
#define KEY_EXTENDED 0xE0
6363
#define KEY_LEFT 0x4B
6464
#define KEY_RIGHT 0x4D
6565
#define KEY_UP 0x48
6666
#define KEY_DOWN 0x50
6767
#else
68-
/* POSIX */
68+
/* POSIX */
6969

70-
// Define includes
70+
// Define includes
7171
#include <stdio.h>
7272
#include <stdlib.h>
7373
#include <unistd.h>

‎Shared/publicsdk/Common.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ using namespace std;
3838
#ifndef __COMMON_H
3939
#define __COMMON_H
4040

41-
// used in the function argument vector
41+
// used in the function argument vector
4242
#define MAX_ARGUMENTS 10
4343
struct FunctionArguments
4444
{

0 commit comments

Comments
 (0)