From ac858f0c2f9fea722d3963cdfdb73f34442c7c0b Mon Sep 17 00:00:00 2001 From: Andrey Akhmichin Date: Mon, 14 Jun 2021 06:34:59 +0500 Subject: [PATCH] #ifdef->#if. --- dlls/asheep/archer.cpp | 2 +- dlls/asheep/barneyhg.cpp | 2 +- dlls/asheep/beretta.cpp | 2 +- dlls/asheep/kmedkit.cpp | 2 +- dlls/asheep/m41a.cpp | 4 ++-- dlls/asheep/poolstick.cpp | 2 +- dlls/asheep/toad.cpp | 6 +++--- dlls/weapons.h | 12 ++++++------ 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/asheep/archer.cpp b/dlls/asheep/archer.cpp index 255cb2b5..98243a52 100644 --- a/dlls/asheep/archer.cpp +++ b/dlls/asheep/archer.cpp @@ -12,7 +12,7 @@ * use or distribution of this code by or to any unlicensed person is illegal. * ****/ -#if !defined( OEM_BUILD ) && !defined( HLDEMO_BUILD ) +#if !OEM_BUILD && !HLDEMO_BUILD //========================================================= // archer diff --git a/dlls/asheep/barneyhg.cpp b/dlls/asheep/barneyhg.cpp index f375658a..4dc4ef48 100644 --- a/dlls/asheep/barneyhg.cpp +++ b/dlls/asheep/barneyhg.cpp @@ -43,7 +43,7 @@ void CBarneyHandGrenade::Spawn() m_iId = WEAPON_BARNEYHANDGRENADE; SET_MODEL( ENT( pev ), "models/w_grenade.mdl" ); -#ifndef CLIENT_DLL +#if !CLIENT_DLL pev->dmg = gSkillData.plrDmgHandGrenade; #endif m_iDefaultAmmo = HANDGRENADE_DEFAULT_GIVE; diff --git a/dlls/asheep/beretta.cpp b/dlls/asheep/beretta.cpp index d605feb9..94085295 100644 --- a/dlls/asheep/beretta.cpp +++ b/dlls/asheep/beretta.cpp @@ -146,7 +146,7 @@ void CBeretta::BerettaFire( float flSpread , float flCycleTime, BOOL fUseAutoAim int flags; -#if defined( CLIENT_WEAPONS ) +#if CLIENT_WEAPONS flags = FEV_NOTHOST; #else flags = 0; diff --git a/dlls/asheep/kmedkit.cpp b/dlls/asheep/kmedkit.cpp index 2a674555..d829cc1f 100644 --- a/dlls/asheep/kmedkit.cpp +++ b/dlls/asheep/kmedkit.cpp @@ -184,7 +184,7 @@ void CKMedKit::UseMedkit( int fMode ) 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 ); diff --git a/dlls/asheep/m41a.cpp b/dlls/asheep/m41a.cpp index 776c9bd0..50f479e3 100644 --- a/dlls/asheep/m41a.cpp +++ b/dlls/asheep/m41a.cpp @@ -162,7 +162,7 @@ void CM41A::PrimaryAttack() Vector vecAiming = m_pPlayer->GetAutoaimVector( AUTOAIM_5DEGREES ); Vector vecDir; -#ifdef CLIENT_DLL +#if CLIENT_DLL if( bIsMultiplayer() ) #else if( g_pGameRules->IsMultiplayer() ) @@ -178,7 +178,7 @@ void CM41A::PrimaryAttack() } int flags; -#if defined( CLIENT_WEAPONS ) +#if CLIENT_WEAPONS flags = FEV_NOTHOST; #else flags = 0; diff --git a/dlls/asheep/poolstick.cpp b/dlls/asheep/poolstick.cpp index 8ff27690..25a880fd 100644 --- a/dlls/asheep/poolstick.cpp +++ b/dlls/asheep/poolstick.cpp @@ -191,7 +191,7 @@ int CPoolstick::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 ); diff --git a/dlls/asheep/toad.cpp b/dlls/asheep/toad.cpp index 9c87d095..f54f5bb4 100644 --- a/dlls/asheep/toad.cpp +++ b/dlls/asheep/toad.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" @@ -41,7 +41,7 @@ enum toad_e { TOAD_THROW }; -#ifndef CLIENT_DLL +#if !CLIENT_DLL class CToadGrenade : public CGrenade { void Spawn( void ); @@ -534,7 +534,7 @@ void CToad::PrimaryAttack() // player "shoot" animation m_pPlayer->SetAnimation( PLAYER_ATTACK1 ); -#ifndef CLIENT_DLL +#if !CLIENT_DLL CBaseEntity *pToad = CBaseEntity::Create( "monster_toad", tr.vecEndPos, m_pPlayer->pev->v_angle, m_pPlayer->edict() ); pToad->pev->velocity = gpGlobals->v_forward * 200 + m_pPlayer->pev->velocity; #endif diff --git a/dlls/weapons.h b/dlls/weapons.h index 2afd7094..59681cc0 100644 --- a/dlls/weapons.h +++ b/dlls/weapons.h @@ -1033,7 +1033,7 @@ private: class CKMedKit : public CBasePlayerWeapon { public: -#ifndef CLIENT_DLL +#if !CLIENT_DLL int Save( CSave &save ); int Restore( CRestore &restore ); static TYPEDESCRIPTION m_SaveData[]; @@ -1062,7 +1062,7 @@ public: virtual BOOL UseDecrement( void ) { -#if defined( CLIENT_WEAPONS ) +#if CLIENT_WEAPONS return TRUE; #else return FALSE; @@ -1096,7 +1096,7 @@ public: virtual BOOL UseDecrement( void ) { -#if defined( CLIENT_WEAPONS ) +#if CLIENT_WEAPONS return TRUE; #else return FALSE; @@ -1133,7 +1133,7 @@ public: virtual BOOL UseDecrement( void ) { -#if defined( CLIENT_WEAPONS ) +#if CLIENT_WEAPONS return TRUE; #else return FALSE; @@ -1165,7 +1165,7 @@ public: virtual BOOL UseDecrement( void ) { -#if defined( CLIENT_WEAPONS ) +#if CLIENT_WEAPONS return TRUE; #else return FALSE; @@ -1196,7 +1196,7 @@ public: virtual BOOL UseDecrement( void ) { -#if defined( CLIENT_WEAPONS ) +#if CLIENT_WEAPONS return TRUE; #else return FALSE;