diff --git a/cl_dll/hl/hl_weapons.cpp b/cl_dll/hl/hl_weapons.cpp index 43fd0d00..ef062f3c 100644 --- a/cl_dll/hl/hl_weapons.cpp +++ b/cl_dll/hl/hl_weapons.cpp @@ -1100,7 +1100,7 @@ void _DLLEXPORT HUD_PostRunCmd( struct local_state_s *from, struct local_state_s HUD_WeaponsPostThink( from, to, cmd, time, random_seed ); } -#if defined( CLIENT_WEAPONS ) +#if CLIENT_WEAPONS if( cl_lw && cl_lw->value ) { HUD_WeaponsPostThink( from, to, cmd, time, random_seed ); diff --git a/dlls/hs/ak47.cpp b/dlls/hs/ak47.cpp index f219cacb..dbd6ae88 100644 --- a/dlls/hs/ak47.cpp +++ b/dlls/hs/ak47.cpp @@ -159,7 +159,7 @@ void CAK47::PrimaryAttack() Vector vecAiming = m_pPlayer->GetAutoaimVector( AUTOAIM_5DEGREES ); Vector vecDir; -#ifdef CLIENT_DLL +#if CLIENT_DLL if ( bIsMultiplayer() ) #else if ( g_pGameRules->IsMultiplayer() ) @@ -175,7 +175,7 @@ void CAK47::PrimaryAttack() } int flags; -#if defined( CLIENT_WEAPONS ) +#if CLIENT_WEAPONS flags = FEV_NOTHOST; #else flags = 0; diff --git a/dlls/hs/beamkatana.cpp b/dlls/hs/beamkatana.cpp index 39b2ffa9..6c2e8dc0 100644 --- a/dlls/hs/beamkatana.cpp +++ b/dlls/hs/beamkatana.cpp @@ -207,7 +207,7 @@ int CBeamKatana::Swing( int fFirst ) UTIL_TraceLine( vecSrc, vecEnd, dont_ignore_monsters, ENT( m_pPlayer->pev ), &tr ); -#ifndef CLIENT_DLL +#if !CLIENT_DLL if ( tr.flFraction >= 1.0f ) { UTIL_TraceHull( vecSrc, vecEnd, dont_ignore_monsters, head_hull, ENT( m_pPlayer->pev ), &tr ); @@ -254,7 +254,7 @@ int CBeamKatana::Swing( int fFirst ) // player "shoot" animation m_pPlayer->SetAnimation( PLAYER_ATTACK1 ); -#ifndef CLIENT_DLL +#if !CLIENT_DLL // hit fDidHit = TRUE; diff --git a/dlls/hs/boombox.cpp b/dlls/hs/boombox.cpp index f1ecaa55..f589bec6 100644 --- a/dlls/hs/boombox.cpp +++ b/dlls/hs/boombox.cpp @@ -119,7 +119,7 @@ void CBoombox::PrimaryAttack() void CBoombox::SecondaryAttack() { EMIT_SOUND(ENT(m_pPlayer->pev), CHAN_WEAPON, "bbox/songrc.wav", 1, ATTN_NORM); //1.83 -#ifndef CLIENT_DLL +#if !CLIENT_DLL UTIL_ScreenShake( m_pPlayer->pev->origin, 25.0, 200.0, 2, 750 ); #endif RadiusDamage( m_pPlayer->pev->origin, pev, m_pPlayer->pev, 10, 750, CLASS_NONE, DMG_BILLNYE | DMG_ALWAYSGIB ); diff --git a/dlls/hs/bow.cpp b/dlls/hs/bow.cpp index d8070c1f..cfc992ce 100644 --- a/dlls/hs/bow.cpp +++ b/dlls/hs/bow.cpp @@ -12,7 +12,7 @@ * without written permission from Valve LLC. * ****/ -#if !defined( OEM_BUILD ) && !defined( HLDEMO_BUILD ) +#if !OEM_BUILD && !HLDEMO_BUILD #include "extdll.h" #include "util.h" @@ -23,7 +23,7 @@ #include "player.h" #include "gamerules.h" -#ifndef CLIENT_DLL +#if !CLIENT_DLL #define BOLT_AIR_VELOCITY 150 #define BOLT_WATER_VELOCITY 50 @@ -328,7 +328,7 @@ void CBow::PrimaryAttack( void ) m_iClip--; int flags; -#if defined( CLIENT_WEAPONS ) +#if CLIENT_WEAPONS flags = FEV_NOTHOST; #else flags = 0; @@ -346,7 +346,7 @@ void CBow::PrimaryAttack( void ) UTIL_TraceLine(vecSrc, vecSrc + vecDir * 8192, dont_ignore_monsters, m_pPlayer->edict(), &tr); -#ifndef CLIENT_DLL +#if !CLIENT_DLL if ( tr.pHit->v.takedamage ) { ClearMultiDamage( ); @@ -372,7 +372,7 @@ void CBow::FireBolt() m_pPlayer->m_rgAmmo[ m_iPrimaryAmmoType ]--; int flags; -#if defined( CLIENT_WEAPONS ) +#if CLIENT_WEAPONS flags = FEV_NOTHOST; #else flags = 0; @@ -390,7 +390,7 @@ void CBow::FireBolt() Vector vecSrc = m_pPlayer->GetGunPosition( ) - gpGlobals->v_up * 2; Vector vecDir = gpGlobals->v_forward; -#ifndef CLIENT_DLL +#if !CLIENT_DLL CBowBolt *pBolt = CBowBolt::BoltCreate(); pBolt->pev->origin = vecSrc; pBolt->pev->angles = anglesAim; diff --git a/dlls/hs/cod_gamerules.cpp b/dlls/hs/cod_gamerules.cpp index b676d7f4..038608f6 100644 --- a/dlls/hs/cod_gamerules.cpp +++ b/dlls/hs/cod_gamerules.cpp @@ -122,7 +122,7 @@ void CCodplay::PlayerKilled( CBasePlayer *pVictim, entvars_t *pKiller, entvars_t // let the killer paint another decal as soon as he'd like. PK->m_flNextDecalTime = gpGlobals->time; } -#ifndef HLDEMO_BUILD +#if !HLDEMO_BUILD if ( pVictim->HasNamedPlayerItem("weapon_satchel") ) { DeactivateSatchels( pVictim ); diff --git a/dlls/hs/dosh.cpp b/dlls/hs/dosh.cpp index 8d94f47e..c843156a 100644 --- a/dlls/hs/dosh.cpp +++ b/dlls/hs/dosh.cpp @@ -12,7 +12,7 @@ * without written permission from Valve LLC. * ****/ -#if !defined( OEM_BUILD ) +#if !OEM_BUILD #include "extdll.h" #include "util.h" @@ -37,7 +37,7 @@ enum dosh_e { LINK_ENTITY_TO_CLASS( weapon_dosh, CDosh ); -#ifndef CLIENT_DLL +#if !CLIENT_DLL LINK_ENTITY_TO_CLASS( dosh_rocket, CDoshRocket ); //========================================================= @@ -252,7 +252,7 @@ void CDosh::Holster( int skiplocal /* = 0 */ ) SendWeaponAnim( DOSH_THROW3 ); -#ifndef CLIENT_DLL +#if !CLIENT_DLL #endif @@ -270,7 +270,7 @@ void CDosh::PrimaryAttack() gpGlobals->v_forward * 512 ); int flags; -#if defined( CLIENT_WEAPONS ) +#if CLIENT_WEAPONS flags = FEV_NOTHOST; #else flags = 0; diff --git a/dlls/hs/fotn.cpp b/dlls/hs/fotn.cpp index 10dde77d..ff5f4c6a 100644 --- a/dlls/hs/fotn.cpp +++ b/dlls/hs/fotn.cpp @@ -176,7 +176,7 @@ int CFOTN::Swing( int fFirst ) UTIL_TraceLine( vecSrc, vecEnd, dont_ignore_monsters, ENT( m_pPlayer->pev ), &tr ); -#ifndef CLIENT_DLL +#if !CLIENT_DLL if ( tr.flFraction >= 1.0 ) { UTIL_TraceHull( vecSrc, vecEnd, dont_ignore_monsters, head_hull, ENT( m_pPlayer->pev ), &tr ); @@ -215,7 +215,7 @@ int CFOTN::Swing( int fFirst ) // player "shoot" animation m_pPlayer->SetAnimation( PLAYER_ATTACK1 ); -#ifndef CLIENT_DLL +#if !CLIENT_DLL // hit fDidHit = TRUE; diff --git a/dlls/hs/fotns.cpp b/dlls/hs/fotns.cpp index f97f97e5..da690d9c 100644 --- a/dlls/hs/fotns.cpp +++ b/dlls/hs/fotns.cpp @@ -232,7 +232,7 @@ int CFOTN::Swing( int fFirst ) UTIL_TraceLine( vecSrc, vecEnd, dont_ignore_monsters, ENT( m_pPlayer->pev ), &tr ); -#ifndef CLIENT_DLL +#if !CLIENT_DLL if ( tr.flFraction >= 1.0f ) { UTIL_TraceHull( vecSrc, vecEnd, dont_ignore_monsters, head_hull, ENT( m_pPlayer->pev ), &tr ); @@ -271,7 +271,7 @@ int CFOTN::Swing( int fFirst ) // player "shoot" animation m_pPlayer->SetAnimation( PLAYER_ATTACK1 ); -#ifndef CLIENT_DLL +#if !CLIENT_DLL // hit fDidHit = TRUE; diff --git a/dlls/hs/goldengun.cpp b/dlls/hs/goldengun.cpp index aaff3694..5dd13fbd 100644 --- a/dlls/hs/goldengun.cpp +++ b/dlls/hs/goldengun.cpp @@ -98,7 +98,7 @@ void CGOLDENGUN::GOLDENGUNFire( float flSpread , float flCycleTime, BOOL fUseAut m_pPlayer->pev->effects = (int)(m_pPlayer->pev->effects) | EF_MUZZLEFLASH; int flags; -#if defined( CLIENT_WEAPONS ) +#if CLIENT_WEAPONS flags = FEV_NOTHOST; #else flags = 0; diff --git a/dlls/hs/jackal.cpp b/dlls/hs/jackal.cpp index f79d9722..a6859639 100644 --- a/dlls/hs/jackal.cpp +++ b/dlls/hs/jackal.cpp @@ -96,7 +96,7 @@ void CJackal::JackalFire( float flSpread , float flCycleTime, BOOL fUseAutoAim ) m_pPlayer->pev->effects = (int)(m_pPlayer->pev->effects) | EF_MUZZLEFLASH; int flags; -#if defined( CLIENT_WEAPONS ) +#if CLIENT_WEAPONS flags = FEV_NOTHOST; #else flags = 0; diff --git a/dlls/hs/jihad.cpp b/dlls/hs/jihad.cpp index 9377e22f..7b6e8fda 100644 --- a/dlls/hs/jihad.cpp +++ b/dlls/hs/jihad.cpp @@ -45,7 +45,7 @@ void CJihad::Spawn( ) m_iId = WEAPON_JIHAD; SET_MODEL(ENT(pev), "models/w_jihad.mdl"); -#ifndef CLIENT_DLL +#if !CLIENT_DLL pev->dmg = gSkillData.plrDmgJihad; #endif @@ -112,7 +112,7 @@ void CJihad::PrimaryAttack() SendWeaponAnim( JIHAD_SHOOT3 ); lolalo = FALSE; m_pPlayer->m_flNextAttack = UTIL_WeaponTimeBase() + 2; - #ifdef CLIENT_DLL + #if CLIENT_DLL //Genuflect #else ExplosionCreate( m_pPlayer->Center(), m_pPlayer->pev->angles, m_pPlayer->edict(), 1080, TRUE ); // BOOM! diff --git a/dlls/hs/modman.cpp b/dlls/hs/modman.cpp index c05239da..707a3fb4 100644 --- a/dlls/hs/modman.cpp +++ b/dlls/hs/modman.cpp @@ -12,7 +12,7 @@ * without written permission from Valve LLC. * ****/ -#if !defined( OEM_BUILD ) && !defined( HLDEMO_BUILD ) +#if !OEM_BUILD && !HLDEMO_BUILD #include "extdll.h" #include "util.h" @@ -23,7 +23,7 @@ #include "player.h" #include "gamerules.h" -#ifndef CLIENT_DLL +#if !CLIENT_DLL #define HORN_AIR_VELOCITY 1800 #define HORN_WATER_VELOCITY 1600 @@ -316,7 +316,7 @@ void CModman::Holster( int skiplocal /* = 0 */ ) void CModman::PrimaryAttack( void ) { -/*#ifdef CLIENT_DLL +/*#if CLIENT_DLL if ( bIsMultiplayer() ) #else if (g_pGameRules->IsMultiplayer()) @@ -346,7 +346,7 @@ void CModman::FireSniperHorn() m_iClip--; int flags; -#if defined( CLIENT_WEAPONS ) +#if CLIENT_WEAPONS flags = FEV_NOTHOST; #else flags = 0; @@ -364,7 +364,7 @@ void CModman::FireSniperHorn() UTIL_TraceLine(vecSrc, vecSrc + vecDir * 8192, dont_ignore_monsters, m_pPlayer->edict(), &tr); -#ifndef CLIENT_DLL +#if !CLIENT_DLL if ( tr.pHit->v.takedamage ) { ClearMultiDamage( ); @@ -389,7 +389,7 @@ void CModman::FireHorn() m_iClip--; int flags; -#if defined( CLIENT_WEAPONS ) +#if CLIENT_WEAPONS flags = FEV_NOTHOST; #else flags = 0; @@ -407,7 +407,7 @@ void CModman::FireHorn() Vector vecSrc = m_pPlayer->GetGunPosition( ) - gpGlobals->v_up * 2; Vector vecDir = gpGlobals->v_forward; -#ifndef CLIENT_DLL +#if !CLIENT_DLL CModmanHorn *pHorn = CModmanHorn::HornCreate(); pHorn->pev->origin = vecSrc; pHorn->pev->angles = anglesAim; diff --git a/dlls/hs/monhunt_gamerules.cpp b/dlls/hs/monhunt_gamerules.cpp index 659ede82..059a1c71 100644 --- a/dlls/hs/monhunt_gamerules.cpp +++ b/dlls/hs/monhunt_gamerules.cpp @@ -21,7 +21,7 @@ #include "player.h" #include "weapons.h" #include "gamerules.h" -#ifndef NO_VOICEGAMEMGR +#if !NO_VOICEGAMEMGR #include "voice_gamemgr.h" #endif #include "monhunt_gamerules.h" @@ -41,11 +41,11 @@ void CMonsterplay::Think( void ) { // longest the intermission can last, in seconds #define MAX_INTERMISSION_TIME 120 -#ifndef NO_VOICEGAMEMGR +#if !NO_VOICEGAMEMGR CVoiceGameMgr g_VoiceGameMgr; #endif float g_flIntermissionStartTime = 0; -#ifndef NO_VOICEGAMEMGR +#if !NO_VOICEGAMEMGR g_VoiceGameMgr.Update(gpGlobals->frametime); #endif ///// Check game rules ///// diff --git a/dlls/hs/mw2.cpp b/dlls/hs/mw2.cpp index b54281e2..53d37b53 100644 --- a/dlls/hs/mw2.cpp +++ b/dlls/hs/mw2.cpp @@ -143,7 +143,7 @@ void CMW2::PrimaryAttack() Vector vecAiming = m_pPlayer->GetAutoaimVector( AUTOAIM_5DEGREES ); Vector vecDir; -#ifdef CLIENT_DLL +#if CLIENT_DLL if ( bIsMultiplayer() ) #else if ( g_pGameRules->IsMultiplayer() ) @@ -159,13 +159,13 @@ void CMW2::PrimaryAttack() } int flags; -#if defined( CLIENT_WEAPONS ) +#if CLIENT_WEAPONS flags = FEV_NOTHOST; #else flags = 0; #endif -#ifndef CLIENT_DLL +#if !CLIENT_DLL UTIL_ScreenShake( m_pPlayer->pev->origin, 250.0, 200.0, 2.5, 1 ); #endif diff --git a/dlls/hs/nstar.cpp b/dlls/hs/nstar.cpp index 2307226c..f478b089 100644 --- a/dlls/hs/nstar.cpp +++ b/dlls/hs/nstar.cpp @@ -12,7 +12,7 @@ * without written permission from Valve LLC. * ****/ -#if !defined( OEM_BUILD ) && !defined( HLDEMO_BUILD ) +#if !OEM_BUILD && !HLDEMO_BUILD #include "extdll.h" #include "util.h" @@ -23,7 +23,7 @@ #include "player.h" #include "gamerules.h" -#ifndef CLIENT_DLL +#if !CLIENT_DLL #define STAR_AIR_VELOCITY 1500 #define STAR_WATER_VELOCITY 150 @@ -305,7 +305,7 @@ void CNStar::FireStar() m_pPlayer->m_rgAmmo[ m_iPrimaryAmmoType ]--; int flags; -#if defined( CLIENT_WEAPONS ) +#if CLIENT_WEAPONS flags = FEV_NOTHOST; #else flags = 0; @@ -323,7 +323,7 @@ void CNStar::FireStar() Vector vecSrc = m_pPlayer->GetGunPosition( ) - gpGlobals->v_up * 2; Vector vecDir = gpGlobals->v_forward; -#ifndef CLIENT_DLL +#if !CLIENT_DLL CNinjaStar *pStar = CNinjaStar::StarCreate(); pStar->pev->origin = vecSrc; pStar->pev->angles = anglesAim; diff --git a/dlls/hs/scipg.cpp b/dlls/hs/scipg.cpp index c4b64264..28627c12 100644 --- a/dlls/hs/scipg.cpp +++ b/dlls/hs/scipg.cpp @@ -12,7 +12,7 @@ * without written permission from Valve LLC. * ****/ -#if !defined( OEM_BUILD ) && !defined( HLDEMO_BUILD ) +#if !OEM_BUILD && !HLDEMO_BUILD #include "extdll.h" #include "util.h" @@ -23,7 +23,7 @@ #include "player.h" #include "gamerules.h" -#ifndef CLIENT_DLL +#if !CLIENT_DLL #define BOLT_AIR_VELOCITY 800 #define BOLT_WATER_VELOCITY 450 @@ -328,7 +328,7 @@ void CSciPG::FireBolt() m_pPlayer->m_rgAmmo[ m_iPrimaryAmmoType ]--; int flags; -#if defined( CLIENT_WEAPONS ) +#if CLIENT_WEAPONS flags = FEV_NOTHOST; #else flags = 0; @@ -346,7 +346,7 @@ void CSciPG::FireBolt() Vector vecSrc = m_pPlayer->GetGunPosition( ) - gpGlobals->v_up * 2; Vector vecDir = gpGlobals->v_forward; -#ifndef CLIENT_DLL +#if !CLIENT_DLL CSciPGBolt *pBolt = CSciPGBolt::BoltCreate(); pBolt->pev->origin = vecSrc; pBolt->pev->angles = anglesAim; diff --git a/dlls/hs/shytplay_gamerules.cpp b/dlls/hs/shytplay_gamerules.cpp index d37bcad3..85b434a9 100644 --- a/dlls/hs/shytplay_gamerules.cpp +++ b/dlls/hs/shytplay_gamerules.cpp @@ -75,7 +75,7 @@ CHalfLifeShytplay :: CHalfLifeShytplay() extern cvar_t timeleft, fragsleft; -#ifndef NO_VOICEGAMEMGR +#if !NO_VOICEGAMEMGR #include "voice_gamemgr.h" extern CVoiceGameMgr g_VoiceGameMgr; #endif @@ -88,7 +88,7 @@ void CHalfLifeShytplay :: Think ( void ) int frags_remaining = 0; int time_remaining = 0; -#ifndef NO_VOICEGAMEMGR +#if !NO_VOICEGAMEMGR g_VoiceGameMgr.Update(gpGlobals->frametime); #endif if ( g_fGameOver ) // someone else quit the game already @@ -154,7 +154,7 @@ void CHalfLifeShytplay :: Think ( void ) //========================================================= BOOL CHalfLifeShytplay :: ClientCommand( CBasePlayer *pPlayer, const char *pcmd ) { -#ifndef NO_VOICEGAMEMGR +#if !NO_VOICEGAMEMGR if(g_VoiceGameMgr.ClientCommand(pPlayer, pcmd)) return TRUE; #endif diff --git a/dlls/hs/soda_can.cpp b/dlls/hs/soda_can.cpp index ae9f28cc..82e40411 100644 --- a/dlls/hs/soda_can.cpp +++ b/dlls/hs/soda_can.cpp @@ -67,7 +67,7 @@ int CSodaCan::AddToPlayer( CBasePlayer *pPlayer ) if ( CBasePlayerWeapon::AddToPlayer( pPlayer ) ) { -#ifndef CLIENT_DLL +#if !CLIENT_DLL if ( g_pGameRules->IsMultiplayer() ) { // in multiplayer, all hivehands come full. @@ -124,7 +124,7 @@ void CSodaCan::PrimaryAttack() m_pPlayer->m_iWeaponVolume = NORMAL_GUN_VOLUME; int flags; -#if defined( CLIENT_WEAPONS ) +#if CLIENT_WEAPONS flags = FEV_NOTHOST; #else flags = 0; diff --git a/dlls/hs/zapper.cpp b/dlls/hs/zapper.cpp index 16500729..675468dc 100644 --- a/dlls/hs/zapper.cpp +++ b/dlls/hs/zapper.cpp @@ -93,7 +93,7 @@ void CZAPPER::ZAPPERFire( float flSpread , float flCycleTime, BOOL fUseAutoAim ) m_pPlayer->pev->effects = (int)(m_pPlayer->pev->effects) | EF_MUZZLEFLASH; int flags; -#if defined( CLIENT_WEAPONS ) +#if CLIENT_WEAPONS flags = FEV_NOTHOST; #else flags = 0; diff --git a/dlls/weapons.h b/dlls/weapons.h index fb554c49..aa0f83c9 100644 --- a/dlls/weapons.h +++ b/dlls/weapons.h @@ -861,7 +861,7 @@ public: // // virtual BOOL UseDecrement( void ) // { -//#if defined( CLIENT_WEAPONS ) +//#if CLIENT_WEAPONS // return TRUE; //#else // return FALSE; @@ -888,7 +888,7 @@ public: virtual BOOL UseDecrement( void ) { -#if defined( CLIENT_WEAPONS ) +#if CLIENT_WEAPONS return TRUE; #else return FALSE; @@ -914,7 +914,7 @@ public: virtual BOOL UseDecrement( void ) { -#if defined( CLIENT_WEAPONS ) +#if CLIENT_WEAPONS return TRUE; #else return FALSE; @@ -949,7 +949,7 @@ public: virtual BOOL UseDecrement( void ) { -#if defined( CLIENT_WEAPONS ) +#if CLIENT_WEAPONS return TRUE; #else return FALSE; @@ -979,7 +979,7 @@ public: virtual BOOL UseDecrement( void ) { -#if defined( CLIENT_WEAPONS ) +#if CLIENT_WEAPONS return TRUE; #else return FALSE; @@ -1054,7 +1054,7 @@ public: virtual BOOL UseDecrement( void ) { -#if defined( CLIENT_WEAPONS ) +#if CLIENT_WEAPONS return TRUE; #else return FALSE; @@ -1135,7 +1135,7 @@ public: virtual BOOL UseDecrement( void ) { -#if defined( CLIENT_WEAPONS ) +#if CLIENT_WEAPONS return TRUE; #else return FALSE; @@ -1165,7 +1165,7 @@ public: BOOL UseDecrement( void ) { -#if defined( CLIENT_WEAPONS ) +#if CLIENT_WEAPONS return TRUE; #else return FALSE; @@ -1262,7 +1262,7 @@ public: virtual BOOL UseDecrement( void ) { -#if defined( CLIENT_WEAPONS ) +#if CLIENT_WEAPONS return TRUE; #else return FALSE; @@ -1291,7 +1291,7 @@ public: virtual BOOL UseDecrement( void ) { -#if defined( CLIENT_WEAPONS ) +#if CLIENT_WEAPONS return TRUE; #else return FALSE; @@ -1352,7 +1352,7 @@ public: virtual BOOL UseDecrement( void ) { -#if defined( CLIENT_WEAPONS ) +#if CLIENT_WEAPONS return TRUE; #else return FALSE; @@ -1417,7 +1417,7 @@ public: virtual BOOL UseDecrement( void ) { -#if defined( CLIENT_WEAPONS ) +#if CLIENT_WEAPONS return TRUE; #else return FALSE;