From 08fb4e13792d667f587795b89171172093f03a74 Mon Sep 17 00:00:00 2001 From: Andrey Akhmichin Date: Wed, 9 Jun 2021 04:35:22 +0500 Subject: [PATCH] #ifdef->#if. --- dlls/gearbox/ctf_gamerules.cpp | 8 ++++---- dlls/gearbox/ctf_gamerules.h | 4 ++-- dlls/gearbox/displacer.cpp | 12 +++++------ dlls/gearbox/eagle.cpp | 12 +++++------ dlls/gearbox/gearbox_client.cpp | 4 ++-- dlls/gearbox/gearbox_utils.cpp | 4 ++-- dlls/gearbox/grapple.cpp | 20 +++++++++---------- dlls/gearbox/grapple_tonguetip.h | 4 ++-- dlls/gearbox/knife.cpp | 8 ++++---- dlls/gearbox/m249.cpp | 6 +++--- dlls/gearbox/penguin.cpp | 8 ++++---- dlls/gearbox/pipewrench.cpp | 12 +++++------ dlls/gearbox/shockrifle.cpp | 22 ++++++++++----------- dlls/gearbox/sniperrifle.cpp | 4 ++-- dlls/gearbox/sporelauncher.cpp | 10 +++++----- dlls/weapons.h | 34 ++++++++++++++++---------------- 16 files changed, 86 insertions(+), 86 deletions(-) diff --git a/dlls/gearbox/ctf_gamerules.cpp b/dlls/gearbox/ctf_gamerules.cpp index c0d62034..6c5c1608 100644 --- a/dlls/gearbox/ctf_gamerules.cpp +++ b/dlls/gearbox/ctf_gamerules.cpp @@ -74,7 +74,7 @@ edict_t *EntSelectSpawnPoint(CBaseEntity *pPlayer, bool bCheckDM) #endif extern edict_t *RuneSelectSpawnPoint(void); -#ifndef NO_VOICEGAMEMGR +#if !NO_VOICEGAMEMGR class CCTFGameMgrHelper : public IVoiceGameMgrHelper { public: @@ -98,7 +98,7 @@ const char* GetTeamName(int team) CCTFMultiplay::CCTFMultiplay() { -#ifndef NO_VOICEGAMEMGR +#if !NO_VOICEGAMEMGR // CHalfLifeMultiplay already initialized it - just override its helper callback. m_VoiceGameMgr.SetHelper(&g_GameMgrHelper); #endif @@ -150,7 +150,7 @@ extern cvar_t timeleft, fragsleft; void CCTFMultiplay::Think(void) { -#ifndef NO_VOICEGAMEMGR +#if !NO_VOICEGAMEMGR m_VoiceGameMgr.Update(gpGlobals->frametime); #endif ///// Check game rules ///// @@ -312,7 +312,7 @@ void DropRune(CBasePlayer *pPlayer); //========================================================= BOOL CCTFMultiplay::ClientCommand(CBasePlayer *pPlayer, const char *pcmd) { -#ifndef NO_VOICEGAMEMGR +#if !NO_VOICEGAMEMGR if (m_VoiceGameMgr.ClientCommand(pPlayer, pcmd)) return TRUE; #endif diff --git a/dlls/gearbox/ctf_gamerules.h b/dlls/gearbox/ctf_gamerules.h index 72db91cd..30a149dd 100644 --- a/dlls/gearbox/ctf_gamerules.h +++ b/dlls/gearbox/ctf_gamerules.h @@ -5,7 +5,7 @@ #define BLUE 2 #define RED 1 -#ifndef NO_VOICEGAMEMGR +#if !NO_VOICEGAMEMGR #include "voice_gamemgr.h" #endif @@ -117,7 +117,7 @@ public: int iRedTeamScore; float m_flFlagStatusTime; -#ifndef NO_VOICEGAMEMGR +#if !NO_VOICEGAMEMGR CVoiceGameMgr m_VoiceGameMgr; #endif private: diff --git a/dlls/gearbox/displacer.cpp b/dlls/gearbox/displacer.cpp index 27ce2a63..6af868bd 100644 --- a/dlls/gearbox/displacer.cpp +++ b/dlls/gearbox/displacer.cpp @@ -23,7 +23,7 @@ #include "shake.h" #include "displacerball.h" -#ifndef CLIENT_DLL +#if !CLIENT_DLL extern edict_t *EntSelectSpawnPoint( CBaseEntity *pPlayer ); @@ -380,7 +380,7 @@ void CDisplacer::Precache(void) PRECACHE_MODEL("sprites/lgtning.spr"); -#ifndef CLIENT_DLL +#if !CLIENT_DLL iPortalSprite = PRECACHE_MODEL("sprites/exit1.spr"); iRingSprite = PRECACHE_MODEL("sprites/disp_ring.spr"); #endif @@ -536,7 +536,7 @@ void CDisplacer::Displace( void ) m_pPlayer->SetAnimation( PLAYER_ATTACK1 ); m_pPlayer->pev->punchangle.x -= 2; -#ifndef CLIENT_DLL +#if !CLIENT_DLL Vector vecSrc; UseAmmo(DISPLACER_PRIMARY_USAGE); @@ -561,7 +561,7 @@ void CDisplacer::Teleport( void ) const char *pszName; ClearBeams(); ClearSpin(); -#ifndef CLIENT_DLL +#if !CLIENT_DLL CBaseEntity *pTarget = NULL; Vector tmp( 0, 0, 0 ); @@ -630,7 +630,7 @@ void CDisplacer::Teleport( void ) void CDisplacer::LightningEffect( void ) { -#ifndef CLIENT_DLL +#if !CLIENT_DLL int m_iBeams = 0; if( g_pGameRules->IsMultiplayer()) @@ -655,7 +655,7 @@ void CDisplacer::LightningEffect( void ) void CDisplacer::ClearBeams( void ) { -#ifndef CLIENT_DLL +#if !CLIENT_DLL if( g_pGameRules->IsMultiplayer()) return; diff --git a/dlls/gearbox/eagle.cpp b/dlls/gearbox/eagle.cpp index 543cfac9..f3738254 100644 --- a/dlls/gearbox/eagle.cpp +++ b/dlls/gearbox/eagle.cpp @@ -29,7 +29,7 @@ enum deagle_e { }; LINK_ENTITY_TO_CLASS( weapon_eagle, CEagle ) -#ifndef CLIENT_DLL +#if !CLIENT_DLL LINK_ENTITY_TO_CLASS( eagle_laser, CLaserSpot ) #endif @@ -105,7 +105,7 @@ void CEagle::SecondaryAttack() m_flNextSecondaryAttack = UTIL_WeaponTimeBase() + 0.5; if (wasActive) { -#ifndef CLIENT_DLL +#if !CLIENT_DLL if (m_pEagleLaser) { EMIT_SOUND_DYN(ENT(m_pPlayer->pev), CHAN_ITEM, "weapons/desert_eagle_sight2.wav", 1.0, ATTN_NORM, 0, PITCH_NORM); @@ -147,7 +147,7 @@ void CEagle::PrimaryAttack() int flags; -#if defined( CLIENT_WEAPONS ) +#if CLIENT_WEAPONS flags = FEV_NOTHOST; #else flags = 0; @@ -166,7 +166,7 @@ void CEagle::PrimaryAttack() { vecDir = m_pPlayer->FireBulletsPlayer( 1, vecSrc, vecAiming, Vector( flSpread, flSpread, flSpread ), 8192, BULLET_PLAYER_EAGLE, 0, 0, m_pPlayer->pev, m_pPlayer->random_seed ); m_flNextPrimaryAttack = UTIL_WeaponTimeBase()+ 0.5; -#ifndef CLIENT_DLL +#if !CLIENT_DLL m_pEagleLaser->Suspend( 0.6 ); #endif } @@ -197,7 +197,7 @@ void CEagle::Reload( void ) if ( m_pEagleLaser && m_fEagleLaserActive ) { -#ifndef CLIENT_DLL +#if !CLIENT_DLL m_pEagleLaser->Suspend( 1.6 ); #endif m_flNextSecondaryAttack = UTIL_WeaponTimeBase() + 1.5; @@ -218,7 +218,7 @@ void CEagle::Reload( void ) void CEagle::UpdateSpot( void ) { -#ifndef CLIENT_DLL +#if !CLIENT_DLL if (m_fEagleLaserActive) { if (m_pPlayer->pev->viewmodel == 0) diff --git a/dlls/gearbox/gearbox_client.cpp b/dlls/gearbox/gearbox_client.cpp index 15f0c38d..c585e68e 100644 --- a/dlls/gearbox/gearbox_client.cpp +++ b/dlls/gearbox/gearbox_client.cpp @@ -1718,7 +1718,7 @@ void RegisterEncoders( void ) int GetWeaponData( struct edict_s *player, struct weapon_data_s *info ) { -#if defined( CLIENT_WEAPONS ) +#if CLIENT_WEAPONS int i; weapon_data_t *item; entvars_t *pev = &player->v; @@ -1865,7 +1865,7 @@ void UpdateClientData ( const edict_t *ent, int sendweapons, struct clientdata_s -#if defined( CLIENT_WEAPONS ) +#if CLIENT_WEAPONS if ( sendweapons ) { if ( pl ) diff --git a/dlls/gearbox/gearbox_utils.cpp b/dlls/gearbox/gearbox_utils.cpp index 2fb17637..5e0caa67 100644 --- a/dlls/gearbox/gearbox_utils.cpp +++ b/dlls/gearbox/gearbox_utils.cpp @@ -152,7 +152,7 @@ UTIL_PrintActivity */ void UTIL_PrintActivity(struct entvars_s* pev, const ALERT_TYPE alert_type) { -#ifndef CLIENT_DLL +#if !CLIENT_DLL ALERT(alert_type, "ALERT: entity %s with classname %s is using animation %s\n", STRING(pev->targetname), STRING(pev->classname), @@ -178,4 +178,4 @@ UTIL_PrintActivity void UTIL_PrintActivity(CBaseEntity* pEntity, const ALERT_TYPE alert_type) { UTIL_PrintActivity(pEntity->edict(), alert_type); -} \ No newline at end of file +} diff --git a/dlls/gearbox/grapple.cpp b/dlls/gearbox/grapple.cpp index 85f687c6..1fc1254c 100644 --- a/dlls/gearbox/grapple.cpp +++ b/dlls/gearbox/grapple.cpp @@ -23,7 +23,7 @@ #include "effects.h" #include "customentity.h" -#ifndef CLIENT_DLL +#if !CLIENT_DLL #include "grapple_tonguetip.h" #endif @@ -170,7 +170,7 @@ void CBarnacleGrapple::PrimaryAttack( void ) } UTIL_MakeVectors( m_pPlayer->pev->v_angle + m_pPlayer->pev->punchangle ); -#ifndef CLIENT_DLL +#if !CLIENT_DLL if( m_pTip ) { if( m_pTip->IsStuck() ) @@ -298,7 +298,7 @@ void CBarnacleGrapple::PrimaryAttack( void ) m_pPlayer->m_iWeaponVolume = 450; m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 0.1; -#ifndef CLIENT_DLL +#if !CLIENT_DLL if( g_pGameRules->IsMultiplayer() ) { m_flShootTime = gpGlobals->time; @@ -318,7 +318,7 @@ void CBarnacleGrapple::PrimaryAttack( void ) return; } -#ifndef CLIENT_DLL +#if !CLIENT_DLL if( m_pTip->GetGrappleType() != GRAPPLE_FIXED && m_pTip->IsStuck() ) { UTIL_MakeVectors( m_pPlayer->pev->v_angle ); @@ -363,7 +363,7 @@ void CBarnacleGrapple::PrimaryAttack( void ) if( m_pTip ) { bool bValidTarget = FALSE; -#ifndef CLIENT_DLL +#if !CLIENT_DLL if( pHit->IsPlayer() ) { m_pTip->SetGrappleTarget( pHit ); @@ -378,7 +378,7 @@ void CBarnacleGrapple::PrimaryAttack( void ) { if( m_flDamageTime + 0.5 < gpGlobals->time ) { -#ifndef CLIENT_DLL +#if !CLIENT_DLL ClearMultiDamage(); float flDamage = gSkillData.plrDmgGrapple; @@ -428,7 +428,7 @@ void CBarnacleGrapple::PrimaryAttack( void ) void CBarnacleGrapple::Fire( Vector vecOrigin, Vector vecDir ) { -#ifndef CLIENT_DLL +#if !CLIENT_DLL Vector vecSrc = vecOrigin; Vector vecEnd = vecSrc + vecDir * 2048.0; @@ -481,7 +481,7 @@ void CBarnacleGrapple::EndAttack( void ) void CBarnacleGrapple::CreateEffect( void ) { -#ifndef CLIENT_DLL +#if !CLIENT_DLL DestroyEffect(); m_pTip = GetClassPtr((CBarnacleGrappleTip *)NULL); @@ -520,7 +520,7 @@ void CBarnacleGrapple::CreateEffect( void ) void CBarnacleGrapple::UpdateEffect( void ) { -#ifndef CLIENT_DLL +#if !CLIENT_DLL if( !m_pBeam || !m_pTip ) CreateEffect(); #endif @@ -533,7 +533,7 @@ void CBarnacleGrapple::DestroyEffect( void ) UTIL_Remove( m_pBeam ); m_pBeam = NULL; } -#ifndef CLIENT_DLL +#if !CLIENT_DLL if( m_pTip ) { m_pTip->Killed( NULL, GIB_NEVER ); diff --git a/dlls/gearbox/grapple_tonguetip.h b/dlls/gearbox/grapple_tonguetip.h index 0eb800dd..90458a24 100644 --- a/dlls/gearbox/grapple_tonguetip.h +++ b/dlls/gearbox/grapple_tonguetip.h @@ -42,7 +42,7 @@ public: bool IsStuck() const { return m_bIsStuck; } bool HasMissed() const { return m_bMissed; } -#ifndef CLIENT_DLL +#if !CLIENT_DLL EHANDLE& GetGrappleTarget() { return m_hGrappleTarget; } void SetGrappleTarget( CBaseEntity* pTarget ) { @@ -53,7 +53,7 @@ private: int m_GrappleType; bool m_bIsStuck; bool m_bMissed; -#ifndef CLIENT_DLL +#if !CLIENT_DLL EHANDLE m_hGrappleTarget; #endif Vector m_vecOriginOffset; diff --git a/dlls/gearbox/knife.cpp b/dlls/gearbox/knife.cpp index e2334140..42df2821 100644 --- a/dlls/gearbox/knife.cpp +++ b/dlls/gearbox/knife.cpp @@ -105,7 +105,7 @@ void CKnife::PrimaryAttack() { if (!Swing(1)) { -#ifndef CLIENT_DLL +#if !CLIENT_DLL SetThink(&CKnife::SwingAgain); pev->nextthink = gpGlobals->time + 0.1; #endif @@ -137,7 +137,7 @@ int CKnife::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); @@ -184,7 +184,7 @@ int CKnife::Swing(int fFirst) // player "shoot" animation m_pPlayer->SetAnimation(PLAYER_ATTACK1); -#ifndef CLIENT_DLL +#if !CLIENT_DLL // hit fDidHit = TRUE; @@ -200,7 +200,7 @@ int CKnife::Swing(int fFirst) // If building with the clientside weapon prediction system, // UTIL_WeaponTimeBase() is always 0 and m_flNextPrimaryAttack is >= -1.0f, thus making // m_flNextPrimaryAttack + 1 < UTIL_WeaponTimeBase() always evaluate to false. -#ifdef CLIENT_WEAPONS +#if CLIENT_WEAPONS if( ( m_flNextPrimaryAttack + 1 == UTIL_WeaponTimeBase() ) || g_pGameRules->IsMultiplayer() ) #else if( ( m_flNextPrimaryAttack + 1 < UTIL_WeaponTimeBase() ) || g_pGameRules->IsMultiplayer() ) diff --git a/dlls/gearbox/m249.cpp b/dlls/gearbox/m249.cpp index 7aa7510e..3c497fa4 100644 --- a/dlls/gearbox/m249.cpp +++ b/dlls/gearbox/m249.cpp @@ -155,7 +155,7 @@ void CM249::PrimaryAttack() Vector vecAiming = m_pPlayer->GetAutoaimVector(AUTOAIM_5DEGREES); Vector vecDir; -#ifdef CLIENT_DLL +#if CLIENT_DLL if (!bIsMultiplayer()) #else if (!g_pGameRules->IsMultiplayer()) @@ -171,7 +171,7 @@ void CM249::PrimaryAttack() } int flags; -#if defined( CLIENT_WEAPONS ) +#if CLIENT_WEAPONS flags = FEV_NOTHOST; #else flags = 0; @@ -180,7 +180,7 @@ void CM249::PrimaryAttack() PLAYBACK_EVENT_FULL(flags, m_pPlayer->edict(), m_usM249, 0.0, (float *)&g_vecZero, (float *)&g_vecZero, vecDir.x, vecDir.y, 0, pev->body, 0, 0); -#ifndef CLIENT_DLL +#if !CLIENT_DLL // Add inverse impulse, but only if we are on the ground. // This is mainly to avoid too-high air velocity. if (m_pPlayer->pev->flags & FL_ONGROUND) diff --git a/dlls/gearbox/penguin.cpp b/dlls/gearbox/penguin.cpp index 0713d8bc..3e181fce 100644 --- a/dlls/gearbox/penguin.cpp +++ b/dlls/gearbox/penguin.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" @@ -40,7 +40,7 @@ enum penguin_e { PENGUIN_THROW }; -#ifndef CLIENT_DLL +#if !CLIENT_DLL class CPenguinGrenade : public CGrenade { @@ -493,7 +493,7 @@ void CPenguin::PrimaryAttack() UTIL_TraceLine(trace_origin + gpGlobals->v_forward * 20, trace_origin + gpGlobals->v_forward * 64, dont_ignore_monsters, NULL, &tr); int flags; -#ifdef CLIENT_WEAPONS +#if CLIENT_WEAPONS flags = FEV_NOTHOST; #else flags = 0; @@ -506,7 +506,7 @@ void CPenguin::PrimaryAttack() // player "shoot" animation m_pPlayer->SetAnimation(PLAYER_ATTACK1); -#ifndef CLIENT_DLL +#if !CLIENT_DLL CBaseEntity *pSqueak = CBaseEntity::Create("monster_penguin", tr.vecEndPos, m_pPlayer->pev->v_angle, m_pPlayer->edict()); pSqueak->pev->velocity = gpGlobals->v_forward * 200 + m_pPlayer->pev->velocity; #endif diff --git a/dlls/gearbox/pipewrench.cpp b/dlls/gearbox/pipewrench.cpp index 6bf6bc0f..ae625c45 100644 --- a/dlls/gearbox/pipewrench.cpp +++ b/dlls/gearbox/pipewrench.cpp @@ -118,7 +118,7 @@ void CPipeWrench::PrimaryAttack() { if (!m_iSwingMode && !Swing(1)) { -#ifndef CLIENT_DLL +#if !CLIENT_DLL SetThink(&CPipeWrench::SwingAgain); pev->nextthink = gpGlobals->time + 0.1; #endif @@ -160,7 +160,7 @@ int CPipeWrench::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 ); @@ -211,7 +211,7 @@ int CPipeWrench::Swing(int fFirst) // player "shoot" animation m_pPlayer->SetAnimation( PLAYER_ATTACK1 ); -#ifndef CLIENT_DLL +#if !CLIENT_DLL // hit fDidHit = TRUE; @@ -225,7 +225,7 @@ int CPipeWrench::Swing(int fFirst) { ClearMultiDamage(); float flDamage; -#ifdef CLIENT_WEAPONS +#if CLIENT_WEAPONS if( ( m_flNextPrimaryAttack + 1 == UTIL_WeaponTimeBase() ) || g_pGameRules->IsMultiplayer() ) #else if( ( m_flNextPrimaryAttack + 1 < UTIL_WeaponTimeBase() ) || g_pGameRules->IsMultiplayer() ) @@ -321,7 +321,7 @@ void CPipeWrench::BigSwing(void) 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 ); @@ -358,7 +358,7 @@ void CPipeWrench::BigSwing(void) // player "shoot" animation m_pPlayer->SetAnimation( PLAYER_ATTACK1 ); -#ifndef CLIENT_DLL +#if !CLIENT_DLL // hit CBaseEntity *pEntity = CBaseEntity::Instance(tr.pHit); diff --git a/dlls/gearbox/shockrifle.cpp b/dlls/gearbox/shockrifle.cpp index 8feefed4..275b7a64 100644 --- a/dlls/gearbox/shockrifle.cpp +++ b/dlls/gearbox/shockrifle.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" @@ -22,7 +22,7 @@ #include "nodes.h" #include "player.h" #include "gamerules.h" -#ifndef CLIENT_DLL +#if !CLIENT_DLL #include "shock.h" #endif @@ -74,7 +74,7 @@ int CShockrifle::AddToPlayer(CBasePlayer *pPlayer) if (CBasePlayerWeapon::AddToPlayer(pPlayer)) { -#ifndef CLIENT_DLL +#if !CLIENT_DLL if (g_pGameRules->IsMultiplayer()) { // in multiplayer, all hivehands come full. @@ -110,7 +110,7 @@ int CShockrifle::GetItemInfo(ItemInfo *p) BOOL CShockrifle::Deploy() { -#ifdef CLIENT_DLL +#if CLIENT_DLL if( bIsMultiplayer() ) #else if( g_pGameRules->IsMultiplayer() ) @@ -141,7 +141,7 @@ void CShockrifle::PrimaryAttack() if (m_pPlayer->pev->waterlevel == 3) { -#ifndef CLIENT_DLL +#if !CLIENT_DLL int attenuation = 150 * m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType]; int dmg = 100 * m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType]; EMIT_SOUND(ENT(pev), CHAN_WEAPON, "weapons/shock_discharge.wav", VOL_NORM, ATTN_NORM); @@ -153,7 +153,7 @@ void CShockrifle::PrimaryAttack() CreateChargeEffect(); -#ifndef CLIENT_DLL +#if !CLIENT_DLL Vector anglesAim = m_pPlayer->pev->v_angle + m_pPlayer->pev->punchangle; anglesAim.x = -anglesAim.x; UTIL_MakeVectors(m_pPlayer->pev->v_angle); @@ -172,7 +172,7 @@ void CShockrifle::PrimaryAttack() m_pPlayer->m_iWeaponFlash = DIM_GUN_FLASH; int flags; -#if defined( CLIENT_WEAPONS ) +#if CLIENT_WEAPONS flags = FEV_NOTHOST; #else flags = 0; @@ -182,7 +182,7 @@ void CShockrifle::PrimaryAttack() // player "shoot" animation m_pPlayer->SetAnimation(PLAYER_ATTACK1); -#ifdef CLIENT_DLL +#if CLIENT_DLL if( bIsMultiplayer() ) #else if( g_pGameRules->IsMultiplayer() ) @@ -211,7 +211,7 @@ void CShockrifle::Reload(void) EMIT_SOUND(ENT(m_pPlayer->pev), CHAN_ITEM, "weapons/shock_recharge.wav", 1, ATTN_NORM); m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType]++; -#ifndef CLIENT_DLL +#if !CLIENT_DLL if( g_pGameRules->IsMultiplayer() ) m_flRechargeTime += 0.25; else @@ -239,7 +239,7 @@ void CShockrifle::WeaponIdle(void) void CShockrifle::CreateChargeEffect( void ) { -#ifndef CLIENT_DLL +#if !CLIENT_DLL if( g_pGameRules->IsMultiplayer()) return; int iBeam = 0; @@ -263,7 +263,7 @@ void CShockrifle::CreateChargeEffect( void ) void CShockrifle::ClearBeams( void ) { -#ifndef CLIENT_DLL +#if !CLIENT_DLL if( g_pGameRules->IsMultiplayer()) return; diff --git a/dlls/gearbox/sniperrifle.cpp b/dlls/gearbox/sniperrifle.cpp index 47bca73a..0a50573e 100644 --- a/dlls/gearbox/sniperrifle.cpp +++ b/dlls/gearbox/sniperrifle.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" @@ -160,7 +160,7 @@ void CSniperrifle::PrimaryAttack() int flags; -#if defined( CLIENT_WEAPONS ) +#if CLIENT_WEAPONS flags = FEV_NOTHOST; #else flags = 0; diff --git a/dlls/gearbox/sporelauncher.cpp b/dlls/gearbox/sporelauncher.cpp index ab09f5df..8a82a85d 100644 --- a/dlls/gearbox/sporelauncher.cpp +++ b/dlls/gearbox/sporelauncher.cpp @@ -21,7 +21,7 @@ #include "nodes.h" #include "player.h" #include "gamerules.h" -#ifndef CLIENT_DLL +#if !CLIENT_DLL #include "sporegrenade.h" #endif @@ -125,7 +125,7 @@ void CSporelauncher::PrimaryAttack() m_iClip--; int flags; -#if defined( CLIENT_WEAPONS ) +#if CLIENT_WEAPONS flags = FEV_NOTHOST; #else flags = 0; @@ -137,7 +137,7 @@ void CSporelauncher::PrimaryAttack() UTIL_MakeVectors( m_pPlayer->pev->v_angle ); Vector vecSrc = m_pPlayer->GetGunPosition( ) + gpGlobals->v_forward * 16 + gpGlobals->v_right * 8 + gpGlobals->v_up * -8; -#ifndef CLIENT_DLL +#if !CLIENT_DLL UTIL_MakeVectors( m_pPlayer->pev->v_angle ); CSporeGrenade::ShootContact( m_pPlayer->pev, vecSrc, gpGlobals->v_forward * 1500 ); #endif @@ -188,7 +188,7 @@ void CSporelauncher::SecondaryAttack(void) int flags; -#if defined( CLIENT_WEAPONS ) +#if CLIENT_WEAPONS flags = FEV_NOTHOST; #else flags = 0; @@ -201,7 +201,7 @@ void CSporelauncher::SecondaryAttack(void) UTIL_MakeVectors( m_pPlayer->pev->v_angle ); Vector vecSrc = m_pPlayer->GetGunPosition( ) + gpGlobals->v_forward * 16 + gpGlobals->v_right * 8 + gpGlobals->v_up * -8; -#ifndef CLIENT_DLL +#if !CLIENT_DLL UTIL_MakeVectors( m_pPlayer->pev->v_angle ); CSporeGrenade::ShootTimed(m_pPlayer->pev, vecSrc, gpGlobals->v_forward * 1000, false); #endif diff --git a/dlls/weapons.h b/dlls/weapons.h index 33aca811..26954396 100644 --- a/dlls/weapons.h +++ b/dlls/weapons.h @@ -1063,7 +1063,7 @@ private: class CDisplacer : public CBasePlayerWeapon { public: -#ifndef CLIENT_DLL +#if !CLIENT_DLL int Save( CSave &save ); int Restore( CRestore &restore ); static TYPEDESCRIPTION m_SaveData[]; @@ -1083,7 +1083,7 @@ public: virtual BOOL UseDecrement( void ) { -#if defined( CLIENT_WEAPONS ) +#if CLIENT_WEAPONS return TRUE; #else return FALSE; @@ -1110,7 +1110,7 @@ private: class CEagle : public CBasePlayerWeapon { public: -#ifndef CLIENT_DLL +#if !CLIENT_DLL int Save( CSave &save ); int Restore( CRestore &restore ); static TYPEDESCRIPTION m_SaveData[]; @@ -1132,7 +1132,7 @@ public: int m_fEagleLaserActive; virtual BOOL UseDecrement( void ) { -#if defined( CLIENT_WEAPONS ) +#if CLIENT_WEAPONS return TRUE; #else return FALSE; @@ -1150,7 +1150,7 @@ class CBarnacleGrappleTip; class CBarnacleGrapple : public CBasePlayerWeapon { public: -#ifndef CLIENT_DLL +#if !CLIENT_DLL virtual int Save( CSave &save ); virtual int Restore( CRestore &restore ); static TYPEDESCRIPTION m_SaveData[]; @@ -1180,7 +1180,7 @@ public: void DestroyEffect( void ); virtual BOOL UseDecrement(void) { -#if defined( CLIENT_WEAPONS ) +#if CLIENT_WEAPONS return TRUE; #else return FALSE; @@ -1220,7 +1220,7 @@ public: virtual BOOL UseDecrement(void) { -#if defined( CLIENT_WEAPONS ) +#if CLIENT_WEAPONS return TRUE; #else return FALSE; @@ -1235,7 +1235,7 @@ class CM249 : public CBasePlayerWeapon { public: -#ifndef CLIENT_DLL +#if !CLIENT_DLL int Save(CSave &save); int Restore(CRestore &restore); static TYPEDESCRIPTION m_SaveData[]; @@ -1259,7 +1259,7 @@ public: virtual BOOL UseDecrement(void) { -#if defined( CLIENT_WEAPONS ) +#if CLIENT_WEAPONS return TRUE; #else return FALSE; @@ -1289,7 +1289,7 @@ public: virtual BOOL UseDecrement(void) { -#if defined( CLIENT_WEAPONS ) +#if CLIENT_WEAPONS return TRUE; #else return FALSE; @@ -1303,7 +1303,7 @@ private: class CPipeWrench : public CBasePlayerWeapon { public: -#ifndef CLIENT_DLL +#if !CLIENT_DLL int Save(CSave &save); int Restore(CRestore &restore); static TYPEDESCRIPTION m_SaveData[]; @@ -1331,7 +1331,7 @@ public: virtual BOOL UseDecrement(void) { -#if defined( CLIENT_WEAPONS ) +#if CLIENT_WEAPONS return TRUE; #else return FALSE; @@ -1362,7 +1362,7 @@ public: virtual BOOL UseDecrement(void) { -#if defined( CLIENT_WEAPONS ) +#if CLIENT_WEAPONS return TRUE; #else return FALSE; @@ -1378,7 +1378,7 @@ class CSniperrifle : public CBasePlayerWeapon { public: -#ifndef CLIENT_DLL +#if !CLIENT_DLL int Save(CSave &save); int Restore(CRestore &restore); static TYPEDESCRIPTION m_SaveData[]; @@ -1402,7 +1402,7 @@ public: virtual BOOL UseDecrement(void) { -#if defined( CLIENT_WEAPONS ) +#if CLIENT_WEAPONS return TRUE; #else return FALSE; @@ -1417,7 +1417,7 @@ class CSporelauncher : public CShotgun { public: -#ifndef CLIENT_DLL +#if !CLIENT_DLL int Save(CSave &save); int Restore(CRestore &restore); static TYPEDESCRIPTION m_SaveData[]; @@ -1437,7 +1437,7 @@ public: virtual BOOL UseDecrement( void ) { -#if defined( CLIENT_WEAPONS ) +#if CLIENT_WEAPONS return TRUE; #else return FALSE;