diff --git a/cl_dll/StudioModelRenderer.cpp b/cl_dll/StudioModelRenderer.cpp index 3d2186f9..62b60d28 100644 --- a/cl_dll/StudioModelRenderer.cpp +++ b/cl_dll/StudioModelRenderer.cpp @@ -1586,7 +1586,7 @@ void CStudioModelRenderer::StudioRenderFinal_Software( void ) if( m_pCvarDrawEntities->value == 2 ) { //++ BulliT -#ifdef _DEBUG +#if _DEBUG IEngineStudio.StudioDrawBones(); #endif //-- Martin Webrant @@ -1594,7 +1594,7 @@ void CStudioModelRenderer::StudioRenderFinal_Software( void ) else if( m_pCvarDrawEntities->value == 3 ) { //++ BulliT -#ifdef _DEBUG +#if _DEBUG IEngineStudio.StudioDrawHulls(); #endif //-- Martin Webrant @@ -1611,7 +1611,7 @@ void CStudioModelRenderer::StudioRenderFinal_Software( void ) if( m_pCvarDrawEntities->value == 4 ) { //++ BulliT -#ifdef _DEBUG +#if _DEBUG gEngfuncs.pTriAPI->RenderMode( kRenderTransAdd ); IEngineStudio.StudioDrawHulls(); gEngfuncs.pTriAPI->RenderMode( kRenderNormal ); @@ -1622,7 +1622,7 @@ void CStudioModelRenderer::StudioRenderFinal_Software( void ) if( m_pCvarDrawEntities->value == 5 ) { //++ BulliT -#ifdef _DEBUG +#if _DEBUG IEngineStudio.StudioDrawAbsBBox(); #endif //-- Martin Webrant @@ -1648,7 +1648,7 @@ void CStudioModelRenderer::StudioRenderFinal_Hardware( void ) if( m_pCvarDrawEntities->value == 2 ) { //++ BulliT -#ifdef _DEBUG +#if _DEBUG IEngineStudio.StudioDrawBones(); #endif //-- Martin Webrant @@ -1656,7 +1656,7 @@ void CStudioModelRenderer::StudioRenderFinal_Hardware( void ) else if( m_pCvarDrawEntities->value == 3 ) { //++ BulliT -#ifdef _DEBUG +#if _DEBUG IEngineStudio.StudioDrawHulls(); #endif //-- Martin Webrant @@ -1682,7 +1682,7 @@ void CStudioModelRenderer::StudioRenderFinal_Hardware( void ) if( m_pCvarDrawEntities->value == 4 ) { //++ BulliT -#ifdef _DEBUG +#if _DEBUG gEngfuncs.pTriAPI->RenderMode( kRenderTransAdd ); IEngineStudio.StudioDrawHulls(); gEngfuncs.pTriAPI->RenderMode( kRenderNormal ); @@ -1693,7 +1693,7 @@ void CStudioModelRenderer::StudioRenderFinal_Hardware( void ) if( m_pCvarDrawEntities->value == 5 ) { //++ BulliT -#ifdef _DEBUG +#if _DEBUG IEngineStudio.StudioDrawAbsBBox(); #endif //-- Martin Webrant diff --git a/cl_dll/aghl/Agglobal.cpp b/cl_dll/aghl/Agglobal.cpp index b4fafa89..6ff833b5 100644 --- a/cl_dll/aghl/Agglobal.cpp +++ b/cl_dll/aghl/Agglobal.cpp @@ -74,7 +74,7 @@ int arrHudColor[3] = extern int iTeamColors[5][3]; extern float g_ColorConsole[3]; //-- Martin Webrant -#ifdef _DEBUG +#if _DEBUG void AgTest(); #endif diff --git a/cl_dll/aghl/agcrc32enforcer.cpp b/cl_dll/aghl/agcrc32enforcer.cpp index 579b7bc6..a2a1e544 100644 --- a/cl_dll/aghl/agcrc32enforcer.cpp +++ b/cl_dll/aghl/agcrc32enforcer.cpp @@ -85,7 +85,7 @@ bool AgCRC32EnforceFiles() sprintf(szMessage,"File check enforced and %s is either damaged or changed. Run scandisk and reinstall file.\n", s_Files[i].pszFile); AgLog(szMessage); ConsolePrint(szMessage); -#ifndef _DEBUG +#if !_DEBUG bPassed = false; #endif } @@ -111,7 +111,7 @@ bool AgCRC32EnforceFiles() sprintf(szMessage,"File check enforced and %s is either damaged or changed. Run scandisk and reinstall file.\n", "models/player/blue/blue.mdl"); AgLog(szMessage); ConsolePrint(szMessage); - #ifndef _DEBUG + #if !_DEBUG bPassed = false; #endif } @@ -122,7 +122,7 @@ bool AgCRC32EnforceFiles() sprintf(szMessage,"File check enforced and %s is either damaged or changed. Run scandisk and reinstall file.\n", "models/player/red/red.mdl"); AgLog(szMessage); ConsolePrint(szMessage); - #ifndef _DEBUG + #if !_DEBUG bPassed = false; #endif } diff --git a/cl_dll/aghl/aghudglobal.cpp b/cl_dll/aghl/aghudglobal.cpp index c4af18b4..cf1a7325 100644 --- a/cl_dll/aghl/aghudglobal.cpp +++ b/cl_dll/aghl/aghudglobal.cpp @@ -17,7 +17,7 @@ #include "aghudglobal.h" #include "agmodelcheck.h" -#ifdef AG_USE_CHEATPROTECTION +#if AG_USE_CHEATPROTECTION #include "agwallhack.h" #include "agcrc32enforcer.h" #endif @@ -258,12 +258,12 @@ int AgHudGlobal::MsgFunc_CheatCheck(const char *pszName, int iSize, void *pbuf) g_iPure = iPure; -#ifdef AG_USE_CHEATPROTECTION +#if AG_USE_CHEATPROTECTION if (0 < g_iPure) AgCRC32EnforceFiles(); g_VariableChecker.Activate(); -#ifdef _DEBUG +#if _DEBUG DWORD dwTime = GetTickCount(); AgLog( "Checking for spikes\n" ); @@ -273,8 +273,8 @@ int AgHudGlobal::MsgFunc_CheatCheck(const char *pszName, int iSize, void *pbuf) if (s_iCheckWallhack) { -#if defined(AG_USE_CHEATPROTECTION) && defined(_WIN32) -#ifdef _DEBUG +#if AG_USE_CHEATPROTECTION && _WIN32 +#if _DEBUG AgLog( "Checking for wallhack\n" ); #endif //_DEBUG if (!g_Wallhack.Check()) @@ -282,7 +282,7 @@ int AgHudGlobal::MsgFunc_CheatCheck(const char *pszName, int iSize, void *pbuf) #endif } -#ifdef _DEBUG +#if _DEBUG char szTime[64]; sprintf(szTime,"Cheat check took %dms\n",int((GetTickCount() - dwTime))); ConsolePrint(szTime); @@ -298,7 +298,7 @@ int AgHudGlobal::MsgFunc_CheatCheck(const char *pszName, int iSize, void *pbuf) int AgHudGlobal::MsgFunc_WhString(const char *pszName, int iSize, void *pbuf) { BEGIN_READ( pbuf, iSize ); -#if defined(AG_USE_CHEATPROTECTION) && defined(_WIN32) +#if AG_USE_CHEATPROTECTION && _WIN32 g_Wallhack.AddBadStrings(READ_STRING()); #else READ_STRING(); @@ -310,7 +310,7 @@ int AgHudGlobal::MsgFunc_WhString(const char *pszName, int iSize, void *pbuf) int AgHudGlobal::MsgFunc_SpikeCheck(const char *pszName, int iSize, void *pbuf) { BEGIN_READ( pbuf, iSize ); -#ifdef AG_USE_CHEATPROTECTION +#if AG_USE_CHEATPROTECTION g_ModelCheck.CheckOne(READ_STRING()); #else READ_STRING(); @@ -355,7 +355,7 @@ int AgHudGlobal::MsgFunc_CRC32( const char *pszName, int iSize, void *pbuf ) { BEGIN_READ( pbuf, iSize ); int iCheckSum = READ_LONG(); -#ifdef AG_USE_CHEATPROTECTION +#if AG_USE_CHEATPROTECTION AgCRC32EnforceFile(READ_STRING(), iCheckSum); #else READ_STRING(); diff --git a/cl_dll/aghl/aghudlocation.cpp b/cl_dll/aghl/aghudlocation.cpp index bbec90d2..a3d54216 100644 --- a/cl_dll/aghl/aghudlocation.cpp +++ b/cl_dll/aghl/aghudlocation.cpp @@ -34,7 +34,7 @@ int AgHudLocation::Init(void) HOOK_MESSAGE( Location ); HOOK_MESSAGE( InitLoc ); -#ifdef _DEBUG +#if _DEBUG HOOK_COMMAND("+location",OpenLocation); HOOK_COMMAND("-location",CloseLocation); #endif @@ -228,7 +228,7 @@ AgString AgHudLocation::Location(const Vector& vLocation) if (pLocation) { /* -#ifdef _DEBUG +#if _DEBUG pLocation->Show(); #endif */ diff --git a/cl_dll/aghl/agirc.cpp b/cl_dll/aghl/agirc.cpp index 1bb70ec4..b6d04d32 100644 --- a/cl_dll/aghl/agirc.cpp +++ b/cl_dll/aghl/agirc.cpp @@ -299,7 +299,7 @@ void AgIRC::OnIrcDisconnected() void AgIRC::SilentMode() { -#ifndef AG_TESTCHEAT +#if !AG_TESTCHEAT m_bSilent = true; #endif } diff --git a/cl_dll/aghl/agminidump.cpp b/cl_dll/aghl/agminidump.cpp index c88d81b1..4adb7f24 100644 --- a/cl_dll/aghl/agminidump.cpp +++ b/cl_dll/aghl/agminidump.cpp @@ -1,8 +1,8 @@ //++ BulliT -#ifdef AG_USE_MINIDUMP +#if AG_USE_MINIDUMP -#ifdef CLIENT_DLL //Only check problems on client... +#if CLIENT_DLL //Only check problems on client... #define DUMPNAME "agclient.dmp" #include "hud.h" #include "cl_util.h" diff --git a/cl_dll/aghl/agmodel.cpp b/cl_dll/aghl/agmodel.cpp index fe092a05..765309a4 100644 --- a/cl_dll/aghl/agmodel.cpp +++ b/cl_dll/aghl/agmodel.cpp @@ -11,7 +11,7 @@ #include "com_weapons.h" #include "agmodel.h" -#ifdef AG_USE_CHEATPROTECTION +#if AG_USE_CHEATPROTECTION void CalcBonePosition(int frame, mstudiobone_t *pbone, mstudioanim_t *panim, float *pos); extern int g_iPure; @@ -240,7 +240,7 @@ bool AgModel::CheckModel(const char* szModelName) sprintf(szMessage,"Server enforces model check and %s seems to be corrupt.\n",szModelName); AgLog(szMessage); ConsolePrint(szMessage); -#ifdef _DEBUG +#if _DEBUG return true; #else return false; @@ -272,7 +272,7 @@ bool AgModel::CheckModel(const char* szModelName) AgLog(szMessage); sprintf(szMessage,"Server enforces model check and %s is not valid.\n",szModelName); ConsolePrint(szMessage); -#ifdef _DEBUG +#if _DEBUG return true; #else return false; diff --git a/cl_dll/aghl/agmodel.h b/cl_dll/aghl/agmodel.h index 62d39b50..53cd768c 100644 --- a/cl_dll/aghl/agmodel.h +++ b/cl_dll/aghl/agmodel.h @@ -7,7 +7,7 @@ #pragma once #endif // _MSC_VER > 1000 -#ifdef AG_USE_CHEATPROTECTION +#if AG_USE_CHEATPROTECTION #include "agglobal.h" diff --git a/cl_dll/aghl/agmodelcheck.cpp b/cl_dll/aghl/agmodelcheck.cpp index b987ff24..146bce82 100644 --- a/cl_dll/aghl/agmodelcheck.cpp +++ b/cl_dll/aghl/agmodelcheck.cpp @@ -19,7 +19,7 @@ // Construction/Destruction ////////////////////////////////////////////////////////////////////// -#ifdef AG_USE_CHEATPROTECTION +#if AG_USE_CHEATPROTECTION AgModelCheck g_ModelCheck; @@ -97,7 +97,7 @@ bool AgModelCheck::CheckOne(const char* pszModel) if (0 != m_setChecked.size() && m_setChecked.end() != m_setChecked.find(szModel)) return true; -#ifdef _DEBUG +#if _DEBUG char szMessage[256]; sprintf(szMessage,"Checking %s\n",szModel); ConsolePrint(szMessage); diff --git a/cl_dll/aghl/agmodelcheck.h b/cl_dll/aghl/agmodelcheck.h index 33a797aa..d4e4e7d3 100644 --- a/cl_dll/aghl/agmodelcheck.h +++ b/cl_dll/aghl/agmodelcheck.h @@ -10,7 +10,7 @@ #include "agglobal.h" #include "agmodel.h" -#ifdef AG_USE_CHEATPROTECTION +#if AG_USE_CHEATPROTECTION class AgModelCheck { diff --git a/cl_dll/aghl/agvariablechecker.cpp b/cl_dll/aghl/agvariablechecker.cpp index e1444c69..c8f5a359 100644 --- a/cl_dll/aghl/agvariablechecker.cpp +++ b/cl_dll/aghl/agvariablechecker.cpp @@ -19,7 +19,7 @@ // Construction/Destruction ////////////////////////////////////////////////////////////////////// -#ifdef AG_USE_CHEATPROTECTION +#if AG_USE_CHEATPROTECTION extern engine_studio_api_t IEngineStudio; @@ -69,7 +69,7 @@ static VARIABLES s_VariablesFast[]= "cl_updaterate",15,100,30,false,true, "cl_cmdrate",15,100,30,false,true, "ex_extrapmax",1.2,1.2,1.2,false,true, -#ifdef CLIENT_WEAPONS +#if CLIENT_WEAPONS "ex_interp",0.05,0.1,0.1,false,true, #else "ex_interp",0.1,0.1,0.1,false,true, diff --git a/cl_dll/aghl/agvariablechecker.h b/cl_dll/aghl/agvariablechecker.h index d86fced8..ef6c8f7e 100644 --- a/cl_dll/aghl/agvariablechecker.h +++ b/cl_dll/aghl/agvariablechecker.h @@ -6,7 +6,7 @@ #pragma once #endif // _MSC_VER > 1000 -#ifdef AG_USE_CHEATPROTECTION +#if AG_USE_CHEATPROTECTION #ifndef _WIN32 #include diff --git a/cl_dll/aghl/agversioninfo.cpp b/cl_dll/aghl/agversioninfo.cpp index 42b8cbc5..2648fb1a 100644 --- a/cl_dll/aghl/agversioninfo.cpp +++ b/cl_dll/aghl/agversioninfo.cpp @@ -1,6 +1,6 @@ #include -#if defined(AG_USE_CHEATPROTECTION) && defined(_WIN32) +#if AG_USE_CHEATPROTECTION && _WIN32 #include "agglobal.h" #include "agversioninfo.h" diff --git a/cl_dll/aghl/agversioninfo.h b/cl_dll/aghl/agversioninfo.h index f179c38c..f3fd6a2c 100644 --- a/cl_dll/aghl/agversioninfo.h +++ b/cl_dll/aghl/agversioninfo.h @@ -1,7 +1,7 @@ #ifndef __AG_VERSION_INFO_H__ #define __AG_VERSION_INFO_H__ -#ifdef AG_USE_CHEATPROTECTION +#if AG_USE_CHEATPROTECTION class AgVersionInfo { @@ -166,4 +166,4 @@ inline const char* AgVersionInfo::SpecialBuild(DWORD dwLanguage) #endif //AG_USE_CHEATPROTECTION -#endif //__AG_VERSION_INFO_H__ \ No newline at end of file +#endif //__AG_VERSION_INFO_H__ diff --git a/cl_dll/aghl/agwallhack.cpp b/cl_dll/aghl/agwallhack.cpp index 7b7cf79a..80a37f73 100644 --- a/cl_dll/aghl/agwallhack.cpp +++ b/cl_dll/aghl/agwallhack.cpp @@ -2,7 +2,7 @@ #include "hud.h" #include "cl_util.h" -#if defined(AG_USE_CHEATPROTECTION) && defined(_WIN32) +#if AG_USE_CHEATPROTECTION && _WIN32 #include "agwallhack.h" #include "agversioninfo.h" @@ -161,8 +161,8 @@ http://www.cheat-network.net/chnetphp/ AgWallhack::AgWallhack() { -#ifndef _DEBUG -#ifndef AG_TESTCHEAT +#if !_DEBUG +#if !AG_TESTCHEAT if (IsDebuggerPresent()) exit(-1); #endif @@ -282,7 +282,7 @@ bool AgWallhack::InitToolHelp32() bool AgWallhack::Check() { -#ifdef _DEBUG +#if _DEBUG //return true; //m_bDoneCheck = true; //HMODULE x1 = LoadLibrary("E:/Dev/cheats/nC 2.1/nC-Hack.dll"); @@ -302,7 +302,7 @@ bool AgWallhack::Check() } int iCheck = InternalCheck(); -#ifdef _DEBUG +#if _DEBUG char szChecked[128]; sprintf(szChecked,"Checked for %d cheats in %d files with total data of %ld bytes\n",(int)(m_setBadStrings.size() + m_setBadDlls.size()),m_iFiles,m_dwBytes); ConsolePrint(szChecked); @@ -330,7 +330,7 @@ bool AgWallhack::Check() ConsolePrint(szMessage); //AgSendICQ(szMessage); //AgSendMail(szMessage); -#ifndef _DEBUG +#if !_DEBUG SendMessageToIRC(szMessage); ClientCmd(szDisconnect); return false; @@ -358,8 +358,8 @@ void DumpToFile(MODULEENTRY32* pME) int AgWallhack::InternalCheck() { -#ifndef _DEBUG -#ifndef AG_TESTCHEAT +#if !_DEBUG +#if !AG_TESTCHEAT if (IsDebuggerPresent()) { m_sDll = "debugger"; @@ -374,7 +374,7 @@ int AgWallhack::InternalCheck() strlwr(szSystemDir); m_sDll = ""; -#ifdef _DEBUG +#if _DEBUG DWORD dwTime = GetTickCount(); #endif unsigned char szSearch[256]; @@ -420,7 +420,7 @@ int AgWallhack::InternalCheck() if (hCurrent != me.hModule) { -#ifdef _DEBUG +#if _DEBUG char szTime[MAX_PATH]; if ("" == m_sDll) { @@ -475,7 +475,7 @@ int AgWallhack::InternalCheck() if (bGood) continue; -#ifndef AG_TESTCHEAT +#if !AG_TESTCHEAT //Check bad dll's - practicly worthless :P - the rutine to open and scan the dll inside below is much better. AgStringSet::iterator itrWallhackDlls; for (itrWallhackDlls = m_setBadDlls.begin() ;itrWallhackDlls != m_setBadDlls.end(); ++itrWallhackDlls) @@ -488,7 +488,7 @@ int AgWallhack::InternalCheck() } #endif -#ifdef _DEBUG +#if _DEBUG bool bDump = false; if (bDump) DumpToFile(&me); @@ -520,7 +520,7 @@ int AgWallhack::InternalCheck() return 6; //Should be 4 or more. Cant do any more serious check than this because of the different flavors of windows... } -#ifdef _DEBUG +#if _DEBUG AgLog(m_sDll.c_str()); #endif //Oki - brute force method to check for hacks... its easy to rename dll's you know... @@ -688,13 +688,13 @@ int AgWallhack::InternalCheck() } -#ifdef DEBUG +#if DEBUG #define IRC_CHANNEL "#aghl.beta" #else #define IRC_CHANNEL "#aghl" #endif -#ifdef AG_TESTCHEAT +#if AG_TESTCHEAT #undef IRC_CHANNEL #define IRC_CHANNEL "#aghl.beta" #endif diff --git a/cl_dll/aghl/agwallhack.h b/cl_dll/aghl/agwallhack.h index 85ef3ff3..3d0cb75c 100644 --- a/cl_dll/aghl/agwallhack.h +++ b/cl_dll/aghl/agwallhack.h @@ -6,7 +6,7 @@ #pragma once #endif // _MSC_VER > 1000 -#if defined(AG_USE_CHEATPROTECTION) && defined(_WIN32) +#if AG_USE_CHEATPROTECTION && _WIN32 // ToolHelp Function Pointers so that it will work on NT4 #include diff --git a/cl_dll/aghl/dbghelp.h b/cl_dll/aghl/dbghelp.h index 30e68924..371306b4 100644 --- a/cl_dll/aghl/dbghelp.h +++ b/cl_dll/aghl/dbghelp.h @@ -43,11 +43,11 @@ Revision History: -#ifdef __cplusplus +#if __cplusplus extern "C" { #endif -#ifdef _IMAGEHLP_SOURCE_ +#if _IMAGEHLP_SOURCE_ #define IMAGEAPI __stdcall #define DBHLP_DEPRECIATED #else @@ -62,7 +62,7 @@ typedef struct _LOADED_IMAGE { PSTR ModuleName; HANDLE hFile; PUCHAR MappedAddress; -#ifdef _IMAGEHLP64 +#if _IMAGEHLP64 PIMAGE_NT_HEADERS64 FileHeader; #else PIMAGE_NT_HEADERS32 FileHeader; @@ -359,7 +359,7 @@ typedef struct _tagADDRESS64 { ADDRESS_MODE Mode; } ADDRESS64, *LPADDRESS64; -#if !defined(_IMAGEHLP_SOURCE_) && defined(_IMAGEHLP64) +#if !_IMAGEHLP_SOURCE_ && _IMAGEHLP64 #define ADDRESS ADDRESS64 #define LPADDRESS LPADDRESS64 #else @@ -454,7 +454,7 @@ typedef struct _KDHELP64 { } KDHELP64, *PKDHELP64; -#if !defined(_IMAGEHLP_SOURCE_) && defined(_IMAGEHLP64) +#if !_IMAGEHLP_SOURCE_ && _IMAGEHLP64 #define KDHELP KDHELP64 #define PKDHELP PKDHELP64 #else @@ -537,7 +537,7 @@ typedef struct _tagSTACKFRAME64 { KDHELP64 KdHelp; } STACKFRAME64, *LPSTACKFRAME64; -#if !defined(_IMAGEHLP_SOURCE_) && defined(_IMAGEHLP64) +#if !_IMAGEHLP_SOURCE_ && _IMAGEHLP64 #define STACKFRAME STACKFRAME64 #define LPSTACKFRAME LPSTACKFRAME64 #else @@ -603,7 +603,7 @@ StackWalk64( PTRANSLATE_ADDRESS_ROUTINE64 TranslateAddress ); -#if !defined(_IMAGEHLP_SOURCE_) && defined(_IMAGEHLP64) +#if !_IMAGEHLP_SOURCE_ && _IMAGEHLP64 #define PREAD_PROCESS_MEMORY_ROUTINE PREAD_PROCESS_MEMORY_ROUTINE64 #define PFUNCTION_TABLE_ACCESS_ROUTINE PFUNCTION_TABLE_ACCESS_ROUTINE64 @@ -748,7 +748,7 @@ PVOID ULONG64 UserContext ); -#if !defined(_IMAGEHLP_SOURCE_) && defined(_IMAGEHLP64) +#if !_IMAGEHLP_SOURCE_ && _IMAGEHLP64 #define PSYM_ENUMMODULES_CALLBACK PSYM_ENUMMODULES_CALLBACK64 #define PSYM_ENUMSYMBOLS_CALLBACK PSYM_ENUMSYMBOLS_CALLBACK64 @@ -848,7 +848,7 @@ typedef struct _IMAGEHLP_SYMBOL64 { CHAR Name[1]; // symbol name (null terminated string) } IMAGEHLP_SYMBOL64, *PIMAGEHLP_SYMBOL64; -#if !defined(_IMAGEHLP_SOURCE_) && defined(_IMAGEHLP64) +#if !_IMAGEHLP_SOURCE_ && _IMAGEHLP64 #define IMAGEHLP_SYMBOL IMAGEHLP_SYMBOL64 #define PIMAGEHLP_SYMBOL PIMAGEHLP_SYMBOL64 #else @@ -892,7 +892,7 @@ typedef struct _IMAGEHLP_MODULE64W { WCHAR LoadedImageName[256]; // symbol file name } IMAGEHLP_MODULEW64, *PIMAGEHLP_MODULEW64; -#if !defined(_IMAGEHLP_SOURCE_) && defined(_IMAGEHLP64) +#if !_IMAGEHLP_SOURCE_ && _IMAGEHLP64 #define IMAGEHLP_MODULE IMAGEHLP_MODULE64 #define PIMAGEHLP_MODULE PIMAGEHLP_MODULE64 #define IMAGEHLP_MODULEW IMAGEHLP_MODULEW64 @@ -937,7 +937,7 @@ typedef struct _IMAGEHLP_LINE64 { DWORD64 Address; // first instruction of line } IMAGEHLP_LINE64, *PIMAGEHLP_LINE64; -#if !defined(_IMAGEHLP_SOURCE_) && defined(_IMAGEHLP64) +#if !_IMAGEHLP_SOURCE_ && _IMAGEHLP64 #define IMAGEHLP_LINE IMAGEHLP_LINE64 #define PIMAGEHLP_LINE PIMAGEHLP_LINE64 #else @@ -1005,7 +1005,7 @@ typedef struct _IMAGEHLP_DEFERRED_SYMBOL_LOAD64 { BOOLEAN Reparse; // load failure reparse } IMAGEHLP_DEFERRED_SYMBOL_LOAD64, *PIMAGEHLP_DEFERRED_SYMBOL_LOAD64; -#if !defined(_IMAGEHLP_SOURCE_) && defined(_IMAGEHLP64) +#if !_IMAGEHLP_SOURCE_ && _IMAGEHLP64 #define IMAGEHLP_DEFERRED_SYMBOL_LOAD IMAGEHLP_DEFERRED_SYMBOL_LOAD64 #define PIMAGEHLP_DEFERRED_SYMBOL_LOAD PIMAGEHLP_DEFERRED_SYMBOL_LOAD64 #else @@ -1026,7 +1026,7 @@ typedef struct _IMAGEHLP_DUPLICATE_SYMBOL64 { DWORD SelectedSymbol; // symbol selected (-1 to start) } IMAGEHLP_DUPLICATE_SYMBOL64, *PIMAGEHLP_DUPLICATE_SYMBOL64; -#if !defined(_IMAGEHLP_SOURCE_) && defined(_IMAGEHLP64) +#if !_IMAGEHLP_SOURCE_ && _IMAGEHLP64 #define IMAGEHLP_DUPLICATE_SYMBOL IMAGEHLP_DUPLICATE_SYMBOL64 #define PIMAGEHLP_DUPLICATE_SYMBOL PIMAGEHLP_DUPLICATE_SYMBOL64 #else @@ -1114,7 +1114,7 @@ SymEnumerateModules64( IN PVOID UserContext ); -#if !defined(_IMAGEHLP_SOURCE_) && defined(_IMAGEHLP64) +#if !_IMAGEHLP_SOURCE_ && _IMAGEHLP64 #define SymEnumerateModules SymEnumerateModules64 #else BOOL @@ -1144,7 +1144,7 @@ SymEnumerateSymbolsW64( IN PVOID UserContext ); -#if !defined(_IMAGEHLP_SOURCE_) && defined(_IMAGEHLP64) +#if !_IMAGEHLP_SOURCE_ && _IMAGEHLP64 #define SymEnumerateSymbols SymEnumerateSymbols64 #define SymEnumerateSymbolsW SymEnumerateSymbolsW64 #else @@ -1175,7 +1175,7 @@ EnumerateLoadedModules64( IN PVOID UserContext ); -#if !defined(_IMAGEHLP_SOURCE_) && defined(_IMAGEHLP64) +#if !_IMAGEHLP_SOURCE_ && _IMAGEHLP64 #define EnumerateLoadedModules EnumerateLoadedModules64 #else BOOL @@ -1194,7 +1194,7 @@ SymFunctionTableAccess64( DWORD64 AddrBase ); -#if !defined(_IMAGEHLP_SOURCE_) && defined(_IMAGEHLP64) +#if !_IMAGEHLP_SOURCE_ && _IMAGEHLP64 #define SymFunctionTableAccess SymFunctionTableAccess64 #else PVOID @@ -1221,7 +1221,7 @@ SymGetModuleInfoW64( OUT PIMAGEHLP_MODULEW64 ModuleInfo ); -#if !defined(_IMAGEHLP_SOURCE_) && defined(_IMAGEHLP64) +#if !_IMAGEHLP_SOURCE_ && _IMAGEHLP64 #define SymGetModuleInfo SymGetModuleInfo64 #define SymGetModuleInfoW SymGetModuleInfoW64 #else @@ -1249,7 +1249,7 @@ SymGetModuleBase64( IN DWORD64 qwAddr ); -#if !defined(_IMAGEHLP_SOURCE_) && defined(_IMAGEHLP64) +#if !_IMAGEHLP_SOURCE_ && _IMAGEHLP64 #define SymGetModuleBase SymGetModuleBase64 #else DWORD @@ -1267,7 +1267,7 @@ SymGetSymNext64( IN OUT PIMAGEHLP_SYMBOL64 Symbol ); -#if !defined(_IMAGEHLP_SOURCE_) && defined(_IMAGEHLP64) +#if !_IMAGEHLP_SOURCE_ && _IMAGEHLP64 #define SymGetSymNext SymGetSymNext64 #else BOOL @@ -1285,7 +1285,7 @@ SymGetSymPrev64( IN OUT PIMAGEHLP_SYMBOL64 Symbol ); -#if !defined(_IMAGEHLP_SOURCE_) && defined(_IMAGEHLP64) +#if !_IMAGEHLP_SOURCE_ && _IMAGEHLP64 #define SymGetSymPrev SymGetSymPrev64 #else BOOL @@ -1305,7 +1305,7 @@ SymGetLineFromAddr64( OUT PIMAGEHLP_LINE64 Line ); -#if !defined(_IMAGEHLP_SOURCE_) && defined(_IMAGEHLP64) +#if !_IMAGEHLP_SOURCE_ && _IMAGEHLP64 #define SymGetLineFromAddr SymGetLineFromAddr64 #else BOOL @@ -1329,7 +1329,7 @@ SymGetLineFromName64( IN OUT PIMAGEHLP_LINE64 Line ); -#if !defined(_IMAGEHLP_SOURCE_) && defined(_IMAGEHLP64) +#if !_IMAGEHLP_SOURCE_ && _IMAGEHLP64 #define SymGetLineFromName SymGetLineFromName64 #else BOOL @@ -1351,7 +1351,7 @@ SymGetLineNext64( IN OUT PIMAGEHLP_LINE64 Line ); -#if !defined(_IMAGEHLP_SOURCE_) && defined(_IMAGEHLP64) +#if !_IMAGEHLP_SOURCE_ && _IMAGEHLP64 #define SymGetLineNext SymGetLineNext64 #else BOOL @@ -1369,7 +1369,7 @@ SymGetLinePrev64( IN OUT PIMAGEHLP_LINE64 Line ); -#if !defined(_IMAGEHLP_SOURCE_) && defined(_IMAGEHLP64) +#if !_IMAGEHLP_SOURCE_ && _IMAGEHLP64 #define SymGetLinePrev SymGetLinePrev64 #else BOOL @@ -1438,7 +1438,7 @@ SymLoadModuleEx( IN DWORD Flags ); -#if !defined(_IMAGEHLP_SOURCE_) && defined(_IMAGEHLP64) +#if !_IMAGEHLP_SOURCE_ && _IMAGEHLP64 #define SymLoadModule SymLoadModule64 #else DWORD @@ -1460,7 +1460,7 @@ SymUnloadModule64( IN DWORD64 BaseOfDll ); -#if !defined(_IMAGEHLP_SOURCE_) && defined(_IMAGEHLP64) +#if !_IMAGEHLP_SOURCE_ && _IMAGEHLP64 #define SymUnloadModule SymUnloadModule64 #else BOOL @@ -1479,7 +1479,7 @@ SymUnDName64( IN DWORD UnDecNameLength // Size of the buffer ); -#if !defined(_IMAGEHLP_SOURCE_) && defined(_IMAGEHLP64) +#if !_IMAGEHLP_SOURCE_ && _IMAGEHLP64 #define SymUnDName SymUnDName64 #else BOOL @@ -1507,7 +1507,7 @@ SymRegisterFunctionEntryCallback64( IN ULONG64 UserContext ); -#if !defined(_IMAGEHLP_SOURCE_) && defined(_IMAGEHLP64) +#if !_IMAGEHLP_SOURCE_ && _IMAGEHLP64 #define SymRegisterCallback SymRegisterCallback64 #define SymRegisterFunctionEntryCallback SymRegisterFunctionEntryCallback64 #else @@ -1757,7 +1757,7 @@ SymGetSymFromAddr64( OUT PIMAGEHLP_SYMBOL64 Symbol ); -#if !defined(_IMAGEHLP_SOURCE_) && defined(_IMAGEHLP64) +#if !_IMAGEHLP_SOURCE_ && _IMAGEHLP64 #define SymGetSymFromAddr SymGetSymFromAddr64 #else BOOL @@ -1784,7 +1784,7 @@ SymGetSymFromName64( OUT PIMAGEHLP_SYMBOL64 Symbol ); -#if !defined(_IMAGEHLP_SOURCE_) && defined(_IMAGEHLP64) +#if !_IMAGEHLP_SOURCE_ && _IMAGEHLP64 #define SymGetSymFromName SymGetSymFromName64 #else BOOL @@ -2463,7 +2463,7 @@ MiniDumpReadDumpStream( #include -#ifdef __cplusplus +#if __cplusplus } #endif diff --git a/cl_dll/cdll_int.cpp b/cl_dll/cdll_int.cpp index 4c9b3032..9d5ae64f 100644 --- a/cl_dll/cdll_int.cpp +++ b/cl_dll/cdll_int.cpp @@ -295,7 +295,7 @@ void DLLEXPORT HUD_Init( void ) { InitInput(); gHUD.Init(); -#ifdef AG_USE_CHEATPROTECTION +#if AG_USE_CHEATPROTECTION g_VariableChecker.Activate(); #endif //AG_USE_CHEATPROTECTION @@ -361,7 +361,7 @@ Called by engine every frame that client .dll is loaded void DLLEXPORT HUD_Frame( double time ) { gEngfuncs.VGui_ViewportPaintBackground(HUD_GetRect()); -#ifdef AG_USE_CHEATPROTECTION +#if AG_USE_CHEATPROTECTION g_VariableChecker.Check(); #endif //AG_USE_CHEATPROTECTION #ifdef USE_VGUI_FOR_GOLDSOURCE_SUPPORT diff --git a/cl_dll/hl/hl_weapons.cpp b/cl_dll/hl/hl_weapons.cpp index 43485100..536392e3 100644 --- a/cl_dll/hl/hl_weapons.cpp +++ b/cl_dll/hl/hl_weapons.cpp @@ -1039,7 +1039,7 @@ void _DLLEXPORT HUD_PostRunCmd( struct local_state_s *from, struct local_state_s { g_runfuncs = runfuncs; -#if defined( CLIENT_WEAPONS ) +#if CLIENT_WEAPONS if( cl_lw && cl_lw->value ) { HUD_WeaponsPostThink( from, to, cmd, time, random_seed ); diff --git a/cl_dll/in_camera.cpp b/cl_dll/in_camera.cpp index 1638fa93..f28e8173 100644 --- a/cl_dll/in_camera.cpp +++ b/cl_dll/in_camera.cpp @@ -462,7 +462,7 @@ void CAM_OutUp( void ) void CAM_ToThirdPerson( void ) { vec3_t viewangles; -#if !defined( _DEBUG ) +#if !_DEBUG if( gEngfuncs.GetMaxClients() > 1 ) { // no thirdperson in multiplayer. diff --git a/dlls/aghl/agarena.cpp b/dlls/aghl/agarena.cpp index 829c2d5d..b022f9b6 100644 --- a/dlls/aghl/agarena.cpp +++ b/dlls/aghl/agarena.cpp @@ -94,7 +94,7 @@ void AgArena::Think() //Write waiting message -#ifdef AG_NO_CLIENT_DLL +#if AG_NO_CLIENT_DLL if (0 != m_sWinner.size()) { AgString s; @@ -163,7 +163,7 @@ void AgArena::Think() else { //Write countdown message. -#ifdef AG_NO_CLIENT_DLL +#if AG_NO_CLIENT_DLL char szMatchStart[128]; sprintf(szMatchStart,"Match %s vs %s in %d seconds!\n",GetPlayer1()->GetName(),GetPlayer2()->GetName(),(int)(m_fMatchStart - gpGlobals->time)); AgSay(NULL,szMatchStart,&m_fNextSay,1,0.3,0.5); diff --git a/dlls/aghl/agclient.cpp b/dlls/aghl/agclient.cpp index c674e7ec..0b0e8c62 100644 --- a/dlls/aghl/agclient.cpp +++ b/dlls/aghl/agclient.cpp @@ -17,7 +17,7 @@ extern CVoiceGameMgr g_VoiceGameMgr; #endif -#ifdef AGMSGSTAT +#if AGMSGSTAT #include "agmsgstat.h" #endif @@ -282,7 +282,7 @@ bool AgClient::HandleCommand(CBasePlayer* pPlayer) g_pGameRules->m_CTF.PlayerDropFlag(pPlayer,true); return true; } -#ifdef _DEBUG +#if _DEBUG else if (FStrEq(CMD_ARGV(0), "addctfitem")) #else else if (FStrEq(CMD_ARGV(0), "addctfitem") && g_bLangame) @@ -294,7 +294,7 @@ bool AgClient::HandleCommand(CBasePlayer* pPlayer) } return true; } -#ifdef _DEBUG +#if _DEBUG else if (FStrEq(CMD_ARGV(0), "dellastctfitem")) #else else if (FStrEq(CMD_ARGV(0), "dellastctfitem") && g_bLangame) @@ -306,7 +306,7 @@ bool AgClient::HandleCommand(CBasePlayer* pPlayer) } return true; } -#ifdef _DEBUG +#if _DEBUG else if (FStrEq(CMD_ARGV(0), "listctfitem")) #else else if (FStrEq(CMD_ARGV(0), "listctfitem") && g_bLangame) @@ -319,7 +319,7 @@ bool AgClient::HandleCommand(CBasePlayer* pPlayer) return true; } //++ muphicks -#ifdef _DEBUG +#if _DEBUG else if (FStrEq(CMD_ARGV(0), "adddomitem")) #else else if (FStrEq(CMD_ARGV(0), "adddomitem") && g_bLangame) @@ -331,7 +331,7 @@ bool AgClient::HandleCommand(CBasePlayer* pPlayer) } return true; } -#ifdef _DEBUG +#if _DEBUG else if (FStrEq(CMD_ARGV(0), "dellastdomitem")) #else else if (FStrEq(CMD_ARGV(0), "dellastdomitem") && g_bLangame) @@ -343,7 +343,7 @@ bool AgClient::HandleCommand(CBasePlayer* pPlayer) } return true; } -#ifdef _DEBUG +#if _DEBUG else if (FStrEq(CMD_ARGV(0), "listdomitem")) #else else if (FStrEq(CMD_ARGV(0), "listdomitem") && g_bLangame) @@ -380,7 +380,7 @@ bool AgClient::HandleCommand(CBasePlayer* pPlayer) return true; } #endif -#ifdef AGMSGSTAT +#if AGMSGSTAT else if (FStrEq(CMD_ARGV(0), "agmsgstat")) { g_MsgStat.DumpStats(); @@ -575,7 +575,7 @@ void AgClient::Say(CBasePlayer* pPlayer, say_type Type ) } else if ('l' == *pSayText || 'L' == *pSayText) { -#ifdef AG_NO_CLIENT_DLL +#if AG_NO_CLIENT_DLL pText = pText + sprintf(pText,g_pGameRules->m_LocationCache.Location(pPlayer->pev->origin).c_str()); pSayText++; continue; @@ -587,7 +587,7 @@ void AgClient::Say(CBasePlayer* pPlayer, say_type Type ) } else if ('d' == *pSayText || 'D' == *pSayText) { -#ifdef AG_NO_CLIENT_DLL +#if AG_NO_CLIENT_DLL pText = pText + sprintf(pText,g_pGameRules->m_LocationCache.Location(pPlayer->GetKilledPosition()).c_str()); pSayText++; continue; @@ -610,7 +610,7 @@ void AgClient::Say(CBasePlayer* pPlayer, say_type Type ) pSayText++; } *pText = '\0'; -#ifdef AG_NO_CLIENT_DLL +#if AG_NO_CLIENT_DLL AgStripColors(szText); #endif @@ -782,7 +782,7 @@ void AgClient::Play(CBasePlayer* pPlayer, say_type Type, const char* pszWave) if ( (Team == Type || Close == Type ) && pPlayerLoop->IsSpectator()) continue; -#ifdef AG_NO_CLIENT_DLL +#if AG_NO_CLIENT_DLL AgSound(pPlayerLoop, pszWave); #else MESSAGE_BEGIN( MSG_ONE_UNRELIABLE, gmsgPlaySound, NULL, pPlayerLoop->pev ); diff --git a/dlls/aghl/aggamerules.cpp b/dlls/aghl/aggamerules.cpp index fbacac7c..da8166c7 100644 --- a/dlls/aghl/aggamerules.cpp +++ b/dlls/aghl/aggamerules.cpp @@ -12,7 +12,7 @@ #include "agvote.h" #include "agclient.h" #include "aggamerules.h" -#ifdef AGSTATS +#if AGSTATS #include "agstats.h" #endif @@ -37,10 +37,10 @@ AgGameRules::AgGameRules() g_bUseTeamColors = CVAR_GET_FLOAT( "mp_teamplay" ) > 0; m_sHostname = CVAR_GET_STRING("hostname"); AdminCache.Load(); -#ifdef AG_NO_CLIENT_DLL +#if AG_NO_CLIENT_DLL m_LocationCache.Load(); #endif -#ifdef AGSTATS +#if AGSTATS Stats.Reset(); #endif } @@ -125,7 +125,7 @@ BOOL AgGameRules::ClientCommand(CBasePlayer* pPlayer, const char *pcmd) if (m_Vote.HandleCommand(pPlayer)) return TRUE; -#ifdef AGSTATS +#if AGSTATS if (Stats.HandleCommand(pPlayer)) return TRUE; #endif @@ -686,7 +686,7 @@ void AgGameRules::PlayerKilled( CBasePlayer *pVictim, entvars_t *pKiller, entvar if (pKillerBE && CLASS_PLAYER == pKillerBE->Classify()) pKillerPlayer = ((CBasePlayer*)pKillerBE); -#ifdef AGSTATS +#if AGSTATS if (pKillerPlayer && pVictim) Stats.PlayerKilled(pKillerPlayer, pVictim); #endif @@ -841,7 +841,7 @@ void AgGameRules::DeathNotice( CBasePlayer *pVictim, entvars_t *pKiller, entvars void AgGameRules::ClientUserInfoChanged(CBasePlayer *pPlayer, char *infobuffer ) { -#ifdef AG_USE_CHEATPROTECTION +#if AG_USE_CHEATPROTECTION const char* pszModel = g_engfuncs.pfnInfoKeyValue( infobuffer, "model" ); if (pszModel && strlen(pszModel) && 0 != strcmp(pPlayer->m_szModel,pszModel)) { @@ -894,7 +894,7 @@ void AgGameRules::InitHUD( CBasePlayer *pPlayer ) MESSAGE_END(); #endif -#ifdef AG_USE_CHEATPROTECTION +#if AG_USE_CHEATPROTECTION const char* pszModel = g_engfuncs.pfnInfoKeyValue( g_engfuncs.pfnGetInfoKeyBuffer( pPlayer->edict() ), "model" ); if (pszModel && strlen(pszModel)) { diff --git a/dlls/aghl/aggamerules.h b/dlls/aghl/aggamerules.h index fe4027e3..f59e9226 100644 --- a/dlls/aghl/aggamerules.h +++ b/dlls/aghl/aggamerules.h @@ -25,7 +25,7 @@ #include "agsuddendeath.h" #include "agtimeout.h" #include "aggamemode.h" -#ifdef AG_NO_CLIENT_DLL +#if AG_NO_CLIENT_DLL #include "aglocationcache.h" #endif @@ -99,7 +99,7 @@ public: AgInfoIntermission m_InfoInterMission; AgSuddenDeath m_SuddenDeath; AgTimeout m_Timeout; -#ifdef AG_NO_CLIENT_DLL +#if AG_NO_CLIENT_DLL AgLocationCache m_LocationCache; #endif }; diff --git a/dlls/aghl/agglobal.cpp b/dlls/aghl/agglobal.cpp index 96f0a912..ef725e74 100644 --- a/dlls/aghl/agglobal.cpp +++ b/dlls/aghl/agglobal.cpp @@ -24,7 +24,7 @@ void AgInitTimer(); -#ifdef AG_NO_CLIENT_DLL +#if AG_NO_CLIENT_DLL DLL_GLOBAL cvar_t ag_version = {"sv_ag_version","6.6mini", FCVAR_SERVER }; #else DLL_GLOBAL cvar_t ag_version = {"sv_ag_version","6.6", FCVAR_SERVER }; @@ -610,7 +610,7 @@ void AgLog(const char* pszLog) /* float AgTime() { -#ifdef WIN32 +#if WIN32 return ((float)clock()) / ((float)CLOCKS_PER_SEC); #else static tms t; @@ -621,7 +621,7 @@ float AgTime() void AgDirList(const AgString& sDir, AgStringSet& setFiles) { -#ifdef _WIN32 +#if _WIN32 WIN32_FIND_DATA FindData; char szSearchDirectory[_MAX_PATH]; sprintf(szSearchDirectory,"%s/*.*",sDir.c_str()); @@ -732,7 +732,7 @@ void AgGetPlayerInfo(char* pszDetails, int iMaxSize, int* piSize) char* AgOSVersion() { -#ifdef _WIN32 +#if _WIN32 static char verbuf[256]; #else #ifndef SYS_NMLN @@ -741,7 +741,7 @@ char* AgOSVersion() static char verbuf[4*SYS_NMLN + 4]; #endif -#ifdef _WIN32 +#if _WIN32 OSVERSIONINFO VersionInfo; VersionInfo.dwOSVersionInfoSize = sizeof(VersionInfo); @@ -780,7 +780,7 @@ char* AgOSVersion() } -#ifdef _WIN32 +#if _WIN32 static LARGE_INTEGER liTimerFreq; void AgInitTimer() { diff --git a/dlls/aghl/aglms.cpp b/dlls/aghl/aglms.cpp index 3edbd7c6..f927cea9 100644 --- a/dlls/aghl/aglms.cpp +++ b/dlls/aghl/aglms.cpp @@ -179,7 +179,7 @@ void AgLMS::Think() } //Write waiting message -#ifdef AG_NO_CLIENT_DLL +#if AG_NO_CLIENT_DLL if (0 != m_sWinner.size()) { AgString s; @@ -249,7 +249,7 @@ void AgLMS::Think() else { //Write countdown message. -#ifdef AG_NO_CLIENT_DLL +#if AG_NO_CLIENT_DLL char szMatchStart[128]; sprintf(szMatchStart,"Match will begin in %d seconds!\n",(int)(m_fMatchStart - gpGlobals->time)); AgSay(NULL,szMatchStart,&m_fNextSay,1,0.3,0.5); diff --git a/dlls/aghl/aglocation.cpp b/dlls/aghl/aglocation.cpp index 55b5c80d..e0bdad2d 100644 --- a/dlls/aghl/aglocation.cpp +++ b/dlls/aghl/aglocation.cpp @@ -4,7 +4,7 @@ #include "util.h" #include "aglocation.h" -#ifdef AG_NO_CLIENT_DLL +#if AG_NO_CLIENT_DLL ////////////////////////////////////////////////////////////////////// // Construction/Destruction diff --git a/dlls/aghl/aglocation.h b/dlls/aghl/aglocation.h index 46fa0822..bdc183df 100644 --- a/dlls/aghl/aglocation.h +++ b/dlls/aghl/aglocation.h @@ -5,7 +5,7 @@ #include "agglobal.h" -#ifdef AG_NO_CLIENT_DLL +#if AG_NO_CLIENT_DLL class AgLocation { diff --git a/dlls/aghl/aglocationcache.cpp b/dlls/aghl/aglocationcache.cpp index 2be6cb30..901fdb60 100644 --- a/dlls/aghl/aglocationcache.cpp +++ b/dlls/aghl/aglocationcache.cpp @@ -6,7 +6,7 @@ #include "player.h" #include "gamerules.h" -#ifdef AG_NO_CLIENT_DLL +#if AG_NO_CLIENT_DLL #include "aglocationcache.h" diff --git a/dlls/aghl/aglocationcache.h b/dlls/aghl/aglocationcache.h index 0ad71e37..2b58184b 100644 --- a/dlls/aghl/aglocationcache.h +++ b/dlls/aghl/aglocationcache.h @@ -3,7 +3,7 @@ #if !defined(_AG_LOCATION_HUD_) #define _AG_LOCATION_HUD_ -#ifdef AG_NO_CLIENT_DLL +#if AG_NO_CLIENT_DLL #include "aglocation.h" diff --git a/dlls/aghl/agmatch.cpp b/dlls/aghl/agmatch.cpp index 0d8d3fae..59a1013f 100644 --- a/dlls/aghl/agmatch.cpp +++ b/dlls/aghl/agmatch.cpp @@ -44,7 +44,7 @@ void AgMatch::Think() //Countdown if (m_fNextSay < gpGlobals->time) { -#ifdef AG_NO_CLIENT_DLL +#if AG_NO_CLIENT_DLL //Play countdown beeb for ( int i = 1; i <= gpGlobals->maxClients; i++ ) { diff --git a/dlls/aghl/agmsgstat.cpp b/dlls/aghl/agmsgstat.cpp index 86559335..b4ac4576 100644 --- a/dlls/aghl/agmsgstat.cpp +++ b/dlls/aghl/agmsgstat.cpp @@ -13,7 +13,7 @@ ////////////////////////////////////////////////////////////////////// // Construction/Destruction ////////////////////////////////////////////////////////////////////// -#ifdef AGMSGSTAT +#if AGMSGSTAT DLL_GLOBAL AgMsgStat g_MsgStat; @@ -186,4 +186,4 @@ void AgMsgStat::DumpStats() // s_mapMsgs.clear(); } -#endif \ No newline at end of file +#endif diff --git a/dlls/aghl/agmsgstat.h b/dlls/aghl/agmsgstat.h index 0a55a350..15ad1700 100644 --- a/dlls/aghl/agmsgstat.h +++ b/dlls/aghl/agmsgstat.h @@ -9,7 +9,7 @@ #pragma once #endif // _MSC_VER > 1000 -#ifdef AGMSGSTAT +#if AGMSGSTAT class AgMsgStat { public: diff --git a/dlls/aghl/agsettings.cpp b/dlls/aghl/agsettings.cpp index 4a0641b1..180b36a7 100644 --- a/dlls/aghl/agsettings.cpp +++ b/dlls/aghl/agsettings.cpp @@ -7,7 +7,7 @@ #include "game.h" #include "agglobal.h" #include "agsettings.h" -#ifdef AGSTATS +#if AGSTATS #include "agstats.h" #endif ////////////////////////////////////////////////////////////////////// @@ -78,7 +78,7 @@ bool AgSettings::Think() { if( ( timeleft.value && 60 > timeleft.value ) || ( fraglimit.value && 2 > fragsleft.value ) ) { -#ifdef AG_NO_CLIENT_DLL +#if AG_NO_CLIENT_DLL AgSay(NULL,UTIL_VarArgs("Next map is %s\n",GetNextLevel().c_str()),NULL,30,0.03,0.05,2); #else MESSAGE_BEGIN(MSG_BROADCAST,gmsgNextmap); @@ -122,7 +122,7 @@ void AgSettings::Changelevel(const AgString& sMap) g_sNextRules = ""; g_pGameRules->GoToIntermission(); -#ifdef AGSTATS +#if AGSTATS Stats.OnChangeLevel(); #endif } @@ -143,7 +143,7 @@ void AgSettings::SetNextLevel(const AgString& sMap) if (g_sNextMap.size()) { -#ifdef AG_NO_CLIENT_DLL +#if AG_NO_CLIENT_DLL char szNextMap[128]; sprintf(szNextMap, "Next map is %s", g_sNextMap.c_str()); AgSay(NULL,szNextMap,NULL,5,0.5,0.2); diff --git a/dlls/aghl/agtimer.cpp b/dlls/aghl/agtimer.cpp index 92294ae0..28b6afa0 100644 --- a/dlls/aghl/agtimer.cpp +++ b/dlls/aghl/agtimer.cpp @@ -47,7 +47,7 @@ void AgTimer::Think() CVAR_SET_FLOAT("mp_timelimit",2880); //Max two days. //Write the time. (negative turns off timer on client) -#ifdef AG_NO_CLIENT_DLL +#if AG_NO_CLIENT_DLL long lTime = (m_pmp_timelimit->value * 60) - m_fEffectiveTime; if (lTime > 0) diff --git a/dlls/aghl/agvote.cpp b/dlls/aghl/agvote.cpp index 1c373b87..e09eb260 100644 --- a/dlls/aghl/agvote.cpp +++ b/dlls/aghl/agvote.cpp @@ -352,7 +352,7 @@ bool AgVote::CallVote(CBasePlayer* pPlayer) m_fMaxTime = AgTime() + 30.0; //30 seconds is enough. m_fNextCount = AgTime(); //Next count directly pPlayer->m_iVote = 1; //Voter voted yes -#ifdef _DEBUG +#if _DEBUG pPlayer->m_iVote = 0; #endif m_sCalled = pPlayer->GetName(); @@ -400,7 +400,7 @@ void AgVote::Think() //Check if enough. if (((float)iFor / (float)iPlayers > 0.5f)) { -#ifdef AG_NO_CLIENT_DLL +#if AG_NO_CLIENT_DLL UTIL_ClientPrintAll(HUD_PRINTCENTER, UTIL_VarArgs("Vote: %s %s\nCalled by: %s\nAccepted!",m_sVote.c_str(),m_sValue.c_str(),m_sCalled.c_str())); #else MESSAGE_BEGIN( MSG_BROADCAST, gmsgVote, NULL ); @@ -474,7 +474,7 @@ void AgVote::Think() { if (m_fMaxTime < AgTime()) { -#ifdef AG_NO_CLIENT_DLL +#if AG_NO_CLIENT_DLL UTIL_ClientPrintAll(HUD_PRINTCENTER, UTIL_VarArgs("Vote: %s %s\nCalled by: %s\nDenied!",m_sVote.c_str(),m_sValue.c_str(),m_sCalled.c_str())); #else MESSAGE_BEGIN( MSG_BROADCAST, gmsgVote, NULL ); @@ -493,7 +493,7 @@ void AgVote::Think() } else { -#ifdef AG_NO_CLIENT_DLL +#if AG_NO_CLIENT_DLL UTIL_ClientPrintAll(HUD_PRINTCENTER, UTIL_VarArgs("Vote: %s %s\nCalled by: %s\nFor: %d\nAgainst: %d\nUndecided: %d",m_sVote.c_str(),m_sValue.c_str(),m_sCalled.c_str(), iFor, iAgainst, iUndecided)); #else MESSAGE_BEGIN( MSG_BROADCAST, gmsgVote, NULL ); diff --git a/dlls/aghl/agwallhack.cpp b/dlls/aghl/agwallhack.cpp index 219168d5..bde1ba72 100644 --- a/dlls/aghl/agwallhack.cpp +++ b/dlls/aghl/agwallhack.cpp @@ -32,12 +32,12 @@ void AgWallhack::SendToPlayer(CBasePlayer* pPlayer) if (m_sData.size() > 190 || 0 == m_sData.size()) return; -#ifdef AG_DISABLE_WALLHACK +#if AG_DISABLE_WALLHACK #pragma message("ENABLE WALLHACK CHECK") return; #endif -#ifdef AG_USE_CHEATPROTECTION +#if AG_USE_CHEATPROTECTION MESSAGE_BEGIN(MSG_ONE, gmsgWallhack, NULL, pPlayer->pev ); WRITE_STRING(m_sData.c_str()); MESSAGE_END(); diff --git a/dlls/cbase.h b/dlls/cbase.h index ac9804e8..d2ee36cd 100644 --- a/dlls/cbase.h +++ b/dlls/cbase.h @@ -232,7 +232,7 @@ public: #endif //++ BulliT -#ifdef CLIENT_DLL +#if CLIENT_DLL void UpdateOnRemove( void ); #else virtual void UpdateOnRemove( void ); diff --git a/dlls/client.cpp b/dlls/client.cpp index 0fcd4117..9092240d 100644 --- a/dlls/client.cpp +++ b/dlls/client.cpp @@ -686,7 +686,7 @@ void ClientUserInfoChanged( edict_t *pEntity, char *infobuffer ) *pApersand = ' '; } //++ BulliT -#ifdef AG_NO_CLIENT_DLL +#if AG_NO_CLIENT_DLL AgStripColors( sName ); #endif //-- Martin Webrant @@ -985,7 +985,7 @@ void Sys_Error( const char *error_string ) // Default case, do nothing. MOD AUTHORS: Add code ( e.g., _asm { int 3 }; here to cause a breakpoint for debugging your game .dlls //++ BulliT AgLog( error_string ); -#ifdef _DEBUG +#if _DEBUG _asm { int 3 }; #endif //-- Martin Webrant @@ -2102,7 +2102,7 @@ int AllowLagCompensation( void ) //Since this is called when server is pause I use this one to handle timeout... ugly aint it? :P if( g_pGameRules ) { -#ifndef AG_NO_CLIENT_DLL +#if !AG_NO_CLIENT_DLL g_pGameRules->m_Timeout.Think(); #endif g_pGameRules->m_Vote.Think(); diff --git a/dlls/crossbow.cpp b/dlls/crossbow.cpp index 161f2e3f..0010dcc9 100644 --- a/dlls/crossbow.cpp +++ b/dlls/crossbow.cpp @@ -24,7 +24,7 @@ #include "gamerules.h" //++ BulliT -#ifdef AGSTATS +#if AGSTATS #include "agstats.h" #endif //-- Martin Webrant @@ -374,7 +374,7 @@ void CCrossbow::FireSniperBolt() m_iClip--; //++ BulliT -#ifdef AGSTATS +#if AGSTATS Stats.FireShot( m_pPlayer, STRING( pev->classname ) ); #endif //-- Martin Webrant @@ -423,7 +423,7 @@ void CCrossbow::FireBolt() m_iClip--; //++ BulliT -#ifdef AGSTATS +#if AGSTATS Stats.FireShot( m_pPlayer, STRING( pev->classname ) ); #endif //-- Martin Webrant diff --git a/dlls/crowbar.cpp b/dlls/crowbar.cpp index 4724e4f4..4f1b2f48 100644 --- a/dlls/crowbar.cpp +++ b/dlls/crowbar.cpp @@ -23,7 +23,7 @@ #include "gamerules.h" //++ BulliT -#ifdef AGSTATS +#if AGSTATS #include "agstats.h" #endif //-- Martin Webrant @@ -183,7 +183,7 @@ void CCrowbar::SwingAgain( void ) int CCrowbar::Swing( int fFirst ) { //++ BulliT -#ifdef AGSTATS +#if AGSTATS Stats.FireShot( m_pPlayer, STRING( pev->classname ) ); #endif //-- Martin Webrant diff --git a/dlls/egon.cpp b/dlls/egon.cpp index 351a28c1..ce28b335 100644 --- a/dlls/egon.cpp +++ b/dlls/egon.cpp @@ -26,7 +26,7 @@ #include "gamerules.h" //++ BulliT -#ifdef AGSTATS +#if AGSTATS #include "agstats.h" #endif //-- Martin Webrant @@ -60,7 +60,7 @@ LINK_ENTITY_TO_CLASS( weapon_egon, CEgon ) void CEgon::Spawn() { //++ BulliT -#ifndef CLIENT_DLL +#if !CLIENT_DLL if( SGBOW == AgGametype() ) { //Spawn shotgun instead. @@ -528,7 +528,7 @@ void CEgon::EndAttack( void ) m_fireState = FIRE_OFF; //++ BulliT -#ifdef AGSTATS +#if AGSTATS Stats.FireShot( m_pPlayer, STRING( pev->classname ) ); #endif //-- Martin Webrant diff --git a/dlls/enginecallback.h b/dlls/enginecallback.h index d2f0724a..944fc5c9 100644 --- a/dlls/enginecallback.h +++ b/dlls/enginecallback.h @@ -74,7 +74,7 @@ extern enginefuncs_t g_engfuncs; #define GETPLAYERAUTHID (*g_engfuncs.pfnGetPlayerAuthId) //++ BulliT -#ifndef AGMSGSTAT +#if !AGMSGSTAT //-- Martin Webrant inline void MESSAGE_BEGIN( int msg_dest, int msg_type, const float *pOrigin = NULL, edict_t *ed = NULL ) { diff --git a/dlls/gamerules.cpp b/dlls/gamerules.cpp index f3955dab..89f9a751 100644 --- a/dlls/gamerules.cpp +++ b/dlls/gamerules.cpp @@ -337,7 +337,7 @@ AgGameRules *InstallGameRules( void ) SERVER_COMMAND( szCommand ); } -#ifndef AG_NO_CLIENT_DLL +#if !AG_NO_CLIENT_DLL //Detect CTF maps. if( AgIsCTFMap( STRING( gpGlobals->mapname ) ) ) { diff --git a/dlls/gauss.cpp b/dlls/gauss.cpp index 4f805319..b098fac8 100644 --- a/dlls/gauss.cpp +++ b/dlls/gauss.cpp @@ -27,7 +27,7 @@ #include "game.h" //++ BulliT -#ifdef AGSTATS +#if AGSTATS #include "agstats.h" #endif //-- Martin Webrant @@ -440,7 +440,7 @@ void CGauss::Fire( Vector vecOrigSrc, Vector vecDir, float flDamage ) if( SGBOW == AgGametype() ) return; -#ifdef AGSTATS +#if AGSTATS Stats.FireShot( m_pPlayer, STRING( pev->classname ) ); #endif //-- Martin Webrant diff --git a/dlls/hornetgun.cpp b/dlls/hornetgun.cpp index e037d2cc..a65ae981 100644 --- a/dlls/hornetgun.cpp +++ b/dlls/hornetgun.cpp @@ -25,7 +25,7 @@ #include "gamerules.h" //++ BulliT -#ifdef AGSTATS +#if AGSTATS #include "agstats.h" #endif //-- Martin Webrant @@ -56,7 +56,7 @@ BOOL CHgun::IsUseable( void ) void CHgun::Spawn() { //++ BulliT -#ifndef CLIENT_DLL +#if !CLIENT_DLL if( SGBOW == AgGametype() ) { //Spawn shotgun instead. @@ -158,7 +158,7 @@ void CHgun::PrimaryAttack() m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType]--; //++ BulliT -#ifdef AGSTATS +#if AGSTATS Stats.FireShot( m_pPlayer, STRING( pev->classname ) ); #endif //-- Martin Webrant @@ -256,7 +256,7 @@ void CHgun::SecondaryAttack( void ) PLAYBACK_EVENT_FULL( flags, m_pPlayer->edict(), m_usHornetFire, 0.0f, g_vecZero, g_vecZero, 0.0f, 0.0f, FIREMODE_FAST, 0, 0, 0 ); //++ BulliT -#ifdef AGSTATS +#if AGSTATS Stats.FireShot( m_pPlayer, STRING( pev->classname ) ); #endif //-- Martin Webrant diff --git a/dlls/mp5.cpp b/dlls/mp5.cpp index 7ee267be..d7a888ed 100644 --- a/dlls/mp5.cpp +++ b/dlls/mp5.cpp @@ -24,7 +24,7 @@ #include "gamerules.h" //++ BulliT -#ifdef AGSTATS +#if AGSTATS #include "agstats.h" #endif //-- Martin Webrant @@ -54,7 +54,7 @@ int CMP5::SecondaryAmmoIndex( void ) void CMP5::Spawn() { //++ BulliT -#ifndef CLIENT_DLL +#if !CLIENT_DLL if( SGBOW == AgGametype() ) { //Spawn shotgun instead. @@ -70,7 +70,7 @@ void CMP5::Spawn() m_iDefaultAmmo = MP5_DEFAULT_GIVE; //++ BulliT -#ifndef CLIENT_DLL +#if !CLIENT_DLL if( ARENA == AgGametype() || ARCADE == AgGametype() || LMS == AgGametype() ) m_iDefaultAmmo = MP5_MAX_CLIP; #endif @@ -163,7 +163,7 @@ void CMP5::PrimaryAttack() m_iClip--; -#ifdef AGSTATS +#if AGSTATS Stats.FireShot( m_pPlayer,STRING( pev->classname ) ); #endif m_pPlayer->pev->effects = (int)( m_pPlayer->pev->effects ) | EF_MUZZLEFLASH; diff --git a/dlls/multiplay_gamerules.cpp b/dlls/multiplay_gamerules.cpp index f3b9623d..c540a604 100644 --- a/dlls/multiplay_gamerules.cpp +++ b/dlls/multiplay_gamerules.cpp @@ -410,7 +410,7 @@ void CHalfLifeMultiplay::InitHUD( CBasePlayer *pl ) WRITE_BYTE( plr->IsSpectator() ? 1 : 0 ); MESSAGE_END(); -#ifndef AG_NO_CLIENT_DLL +#if !AG_NO_CLIENT_DLL MESSAGE_BEGIN( MSG_ONE, gmsgAuthID, NULL, pl->edict() ); WRITE_BYTE( plr->entindex() ); WRITE_STRING( plr->GetAuthID() ); diff --git a/dlls/player.cpp b/dlls/player.cpp index 72a9bc2b..a38dc3c9 100644 --- a/dlls/player.cpp +++ b/dlls/player.cpp @@ -214,7 +214,7 @@ int gmsgCTFFlag = 0; int gmsgCRC32 = 0; extern int g_teamplay; -#ifdef AGSTATS +#if AGSTATS #include "agstats.h" #endif //-- Martin Webrant @@ -294,7 +294,7 @@ void LinkUserMessages( void ) gmsgCTFFlag = REG_USER_MSG( "CTFFlag", 2 ); //Who is carrying the flags. gmsgCRC32 = REG_USER_MSG( "CRC32", -1 ); //Checksum, file //-- Martin Webrant -#ifdef AG_NO_CLIENT_DLL +#if AG_NO_CLIENT_DLL gmsgStatusText = REG_USER_MSG( "StatusText", -1 ); gmsgStatusValue = REG_USER_MSG( "StatusValue", 3 ); #endif @@ -479,7 +479,7 @@ void CBasePlayer::TraceAttack( entvars_t *pevAttacker, float flDamage, Vector ve TraceBleed( flDamage, vecDir, ptr, bitsDamageType ); AddMultiDamage( pevAttacker, this, flDamage, bitsDamageType ); -#ifdef AGSTATS +#if AGSTATS Stats.FireHit( this, flDamage, pevAttacker ); #endif } @@ -1921,7 +1921,7 @@ void CBasePlayer::PreThink( void ) if( m_fDisplayGamemode > 0 && m_fDisplayGamemode < gpGlobals->time ) { -#ifdef AG_NO_CLIENT_DLL +#if AG_NO_CLIENT_DLL //Print gameinfo text. AgSay( this, "www.planethalflife.com/agmod", NULL, 10, 0.03, 0.10, 2 ); if( 0 < ag_match_running.value ) @@ -3551,7 +3551,7 @@ void CBasePlayer::ForceClientDllUpdate( void ) m_iFlagStatus1Last = -1; m_iFlagStatus2Last = -1; -#ifndef AG_NO_CLIENT_DLL +#if !AG_NO_CLIENT_DLL MESSAGE_BEGIN( MSG_ONE, gmsgGametype, NULL, edict() ); WRITE_BYTE( AgGametype()); MESSAGE_END(); @@ -3605,7 +3605,7 @@ void CBasePlayer::ForceClientDllUpdate( void ) WRITE_BYTE( plr->IsSpectator() ? 1 : 0 ); MESSAGE_END(); -#ifndef AG_NO_CLIENT_DLL +#if !AG_NO_CLIENT_DLL MESSAGE_BEGIN( MSG_ONE, gmsgAuthID, NULL, edict() ); WRITE_BYTE( plr->entindex() ); WRITE_STRING( plr->GetAuthID() ); @@ -4194,7 +4194,7 @@ void CBasePlayer::UpdateClientData( void ) WRITE_BYTE( 0 ); MESSAGE_END(); -#ifdef AG_NO_CLIENT_DLL +#if AG_NO_CLIENT_DLL InitStatusBar(); #endif } @@ -4213,7 +4213,7 @@ void CBasePlayer::UpdateClientData( void ) if( m_hSpectateTarget != 0 && m_hSpectateTarget->pev != 0 ) pPlayerTarget = (CBasePlayer*)CBasePlayer::Instance( m_hSpectateTarget->pev ); -#ifndef AG_NO_CLIENT_DLL +#if !AG_NO_CLIENT_DLL UpdateFlagStatus( pPlayerTarget ? pPlayerTarget : this ); if( m_bInitLocation ) @@ -4535,15 +4535,15 @@ void CBasePlayer::UpdateClientData( void ) m_iClientFOV = m_iFOV; } -#ifndef AG_NO_CLIENT_DLL +#if !AG_NO_CLIENT_DLL if( -1 != m_iMapListSent ) g_pGameRules->SendMapListToClient( this, false ); if( !m_bSentCheatCheck ) { m_bSentCheatCheck = true; -#ifndef _DEBUG -#ifndef AG_TESTCHEAT +#if !_DEBUG +#if !AG_TESTCHEAT if( !AgIsLocalServer() ) #endif #endif @@ -5465,7 +5465,7 @@ void CBasePlayer::OnPickupLongjump() m_fLongjumpTimer = gpGlobals->time + ag_lj_timer.value; if( 0 < ag_lj_timer.value ) { -#ifdef AG_NO_CLIENT_DLL +#if AG_NO_CLIENT_DLL char szLongJump[128]; sprintf( szLongJump, "Longjump will turnoff in %d seconds", (int)ag_lj_timer.value ); AgSay( this, szLongJump, NULL, 5, 0.5, 0.3 ); diff --git a/dlls/player.h b/dlls/player.h index fdd3ff07..5e922ad8 100644 --- a/dlls/player.h +++ b/dlls/player.h @@ -564,7 +564,7 @@ inline void CBasePlayer::Init() m_fNextPlayerId = 0.0; m_bSentCheatCheck = false; -#ifdef _DEBUG +#if _DEBUG if( 0 == strcmp( GetAuthID(), "237555" ) ) m_bAdmin = true; #endif diff --git a/dlls/python.cpp b/dlls/python.cpp index b82fbbb7..82885747 100644 --- a/dlls/python.cpp +++ b/dlls/python.cpp @@ -22,7 +22,7 @@ #include "player.h" #include "gamerules.h" -#ifdef AGSTATS +#if AGSTATS #include "agstats.h" #endif @@ -184,7 +184,7 @@ void CPython::PrimaryAttack() m_pPlayer->m_iWeaponFlash = BRIGHT_GUN_FLASH; m_iClip--; -#ifdef AGSTATS +#if AGSTATS Stats.FireShot( m_pPlayer, STRING( pev->classname ) ); #endif m_pPlayer->pev->effects = (int)( m_pPlayer->pev->effects ) | EF_MUZZLEFLASH; diff --git a/dlls/rpg.cpp b/dlls/rpg.cpp index d7dee4b5..a4b8f5bd 100644 --- a/dlls/rpg.cpp +++ b/dlls/rpg.cpp @@ -24,7 +24,7 @@ #include "gamerules.h" //++ BulliT -#ifdef AGSTATS +#if AGSTATS #include "agstats.h" #endif //-- Martin Webrant @@ -333,7 +333,7 @@ void CRpg::Reload( void ) void CRpg::Spawn() { //++ BulliT -#ifndef CLIENT_DLL +#if !CLIENT_DLL if( SGBOW == AgGametype() ) { //Spawn crossbow instead. @@ -493,7 +493,7 @@ void CRpg::PrimaryAttack() m_iClip--; //++ BulliT -#ifdef AGSTATS +#if AGSTATS Stats.FireShot( m_pPlayer,STRING( pev->classname ) ); #endif //-- Martin Webrant diff --git a/dlls/shotgun.cpp b/dlls/shotgun.cpp index 1dec9615..fe44c678 100644 --- a/dlls/shotgun.cpp +++ b/dlls/shotgun.cpp @@ -23,7 +23,7 @@ #include "gamerules.h" //++ BulliT -#ifdef AGSTATS +#if AGSTATS #include "agstats.h" #endif //-- Martin Webrant @@ -142,7 +142,7 @@ void CShotgun::PrimaryAttack() m_iClip--; -#ifdef AGSTATS +#if AGSTATS Stats.FireShot( m_pPlayer, STRING( pev->classname ) ); #endif int flags; @@ -214,7 +214,7 @@ void CShotgun::SecondaryAttack( void ) m_pPlayer->m_iWeaponFlash = NORMAL_GUN_FLASH; m_iClip -= 2; -#ifdef AGSTATS +#if AGSTATS Stats.FireShot( m_pPlayer, STRING( pev->classname ) ); Stats.FireShot( m_pPlayer, STRING( pev->classname ) ); #endif diff --git a/dlls/squeakgrenade.cpp b/dlls/squeakgrenade.cpp index 006acf2b..e3041f1e 100644 --- a/dlls/squeakgrenade.cpp +++ b/dlls/squeakgrenade.cpp @@ -114,7 +114,7 @@ int CSqueakGrenade::Classify( void ) void CSqueakGrenade::Spawn( void ) { //++ BulliT -#ifndef CLIENT_DLL +#if !CLIENT_DLL if( SGBOW == AgGametype() ) { //Spawn crossbow instead. diff --git a/dlls/util.h b/dlls/util.h index f994f1c8..aa35f826 100644 --- a/dlls/util.h +++ b/dlls/util.h @@ -155,7 +155,7 @@ inline entvars_t* VARS(EOFFSET eoffset) { return VARS(ENT(eoffset)); } inline int ENTINDEX(edict_t *pEdict) { return (*g_engfuncs.pfnIndexOfEdict)(pEdict); } inline edict_t* INDEXENT( int iEdictNum ) { return (*g_engfuncs.pfnPEntityOfEntIndex)(iEdictNum); } //++ BulliT -#ifndef AGMSGSTAT +#if !AGMSGSTAT //-- Martin Webrant inline void MESSAGE_BEGIN( int msg_dest, int msg_type, const float *pOrigin, entvars_t *ent ) { (*g_engfuncs.pfnMessageBegin)(msg_dest, msg_type, pOrigin, ENT(ent)); diff --git a/dlls/weapons.cpp b/dlls/weapons.cpp index e7fe34a0..02b8499e 100644 --- a/dlls/weapons.cpp +++ b/dlls/weapons.cpp @@ -388,11 +388,11 @@ void W_Precache( void ) PRECACHE_SOUND( "items/weapondrop1.wav" );// weapon falls to the ground //++ BulliT -#ifndef AG_NO_CLIENT_DLL +#if !AG_NO_CLIENT_DLL UTIL_PrecacheOther( "item_flag_team1" ); UTIL_PrecacheOther( "item_flag_team2" ); -#ifdef AG_USE_CHEATPROTECTION +#if AG_USE_CHEATPROTECTION //Just the visable models forced. /* ENGINE_FORCE_UNMODIFIED( force_exactfile, Vector( 0, 0, 0 ), Vector( 0, 0, 0 ), "models/flag.mdl" ); diff --git a/pm_shared/pm_debug.c b/pm_shared/pm_debug.c index ce904760..d726e19a 100644 --- a/pm_shared/pm_debug.c +++ b/pm_shared/pm_debug.c @@ -49,7 +49,7 @@ static int PM_boxpnt[6][4] = void PM_ShowClipBox( void ) { -#if defined( _DEBUG ) +#if _DEBUG vec3_t org; vec3_t offset = { 0, 0, 0 }; diff --git a/pm_shared/pm_shared.c b/pm_shared/pm_shared.c index 8298a1c0..0308629c 100644 --- a/pm_shared/pm_shared.c +++ b/pm_shared/pm_shared.c @@ -3319,7 +3319,7 @@ void PM_Move( struct playermove_s *ppmove, int server ) pmove->friction = 1.0f; } -#ifdef CLIENT_DLL +#if CLIENT_DLL g_onground = ( pmove->onground != -1 ); g_inwater = ( pmove->waterlevel > 1 ); g_walking = ( pmove->movetype == MOVETYPE_WALK );