From 1c849c0ba3474ee6ccc92648a79821ced87357fd Mon Sep 17 00:00:00 2001 From: Andrey Akhmichin Date: Mon, 14 Jun 2021 23:03:45 +0500 Subject: [PATCH] #ifdef->#if. --- cl_dll/hl/hl_weapons.cpp | 2 +- dlls/crossbow.cpp | 2 +- dlls/eftd/ak47.cpp | 2 +- dlls/eftd/mac10.cpp | 2 +- dlls/weapons.cpp | 2 +- dlls/weapons.h | 6 +++--- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cl_dll/hl/hl_weapons.cpp b/cl_dll/hl/hl_weapons.cpp index 2269a2dc..01527aaf 100644 --- a/cl_dll/hl/hl_weapons.cpp +++ b/cl_dll/hl/hl_weapons.cpp @@ -1040,7 +1040,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/dlls/crossbow.cpp b/dlls/crossbow.cpp index 6c6acdfa..25547dff 100644 --- a/dlls/crossbow.cpp +++ b/dlls/crossbow.cpp @@ -437,7 +437,7 @@ void CCrossbow::FireBolt() Vector vecDir = m_pPlayer->FireBulletsPlayer( 1, vecSrc, vecAiming, VECTOR_CONE_1DEGREES, 8192, BULLET_PLAYER_SNIPER, 0, 0, m_pPlayer->pev, m_pPlayer->random_seed ); int flags; -#if defined( CLIENT_WEAPONS ) +#if CLIENT_WEAPONS flags = FEV_NOTHOST; #else flags = 0; diff --git a/dlls/eftd/ak47.cpp b/dlls/eftd/ak47.cpp index 1e8811b7..8315137d 100644 --- a/dlls/eftd/ak47.cpp +++ b/dlls/eftd/ak47.cpp @@ -167,7 +167,7 @@ void CAK47::PrimaryAttack() vecDir = m_pPlayer->FireBulletsPlayer(1, vecSrc, vecAiming, vecSpread, 8192, BULLET_PLAYER_AK47, 2, 0, m_pPlayer->pev, m_pPlayer->random_seed); int flags; -#if defined( CLIENT_WEAPONS ) +#if CLIENT_WEAPONS flags = FEV_NOTHOST; #else flags = 0; diff --git a/dlls/eftd/mac10.cpp b/dlls/eftd/mac10.cpp index 6aced5b1..42b46d3a 100644 --- a/dlls/eftd/mac10.cpp +++ b/dlls/eftd/mac10.cpp @@ -152,7 +152,7 @@ void CMac10::PrimaryAttack() vecDir = m_pPlayer->FireBulletsPlayer(1, vecSrc, vecAiming, vecSpread, 8192, BULLET_PLAYER_MAC10, 2, 0, m_pPlayer->pev, m_pPlayer->random_seed); int flags; -#if defined( CLIENT_WEAPONS ) +#if CLIENT_WEAPONS flags = FEV_NOTHOST; #else flags = 0; diff --git a/dlls/weapons.cpp b/dlls/weapons.cpp index bf2f9cd8..47347de6 100644 --- a/dlls/weapons.cpp +++ b/dlls/weapons.cpp @@ -353,7 +353,7 @@ void W_Precache( void ) UTIL_PrecacheOtherWeapon( "weapon_mac10" ); UTIL_PrecacheOther( "ammo_mac10" ); -#if !defined( OEM_BUILD ) && !defined( HLDEMO_BUILD ) +#if !OEM_BUILD && !HLDEMO_BUILD if( g_pGameRules->IsDeathmatch() ) { UTIL_PrecacheOther( "weaponbox" );// container for dropped deathmatch weapons diff --git a/dlls/weapons.h b/dlls/weapons.h index e9bfda07..c7799995 100644 --- a/dlls/weapons.h +++ b/dlls/weapons.h @@ -582,7 +582,7 @@ public: #endif } -#ifndef CLIENT_DLL +#if !CLIENT_DLL int Save( CSave &save ); int Restore( CRestore &restore ); static TYPEDESCRIPTION m_SaveData[]; @@ -1032,7 +1032,7 @@ public: BOOL UseDecrement( void ) { -#if defined( CLIENT_WEAPONS ) +#if CLIENT_WEAPONS return TRUE; #else return FALSE; @@ -1059,7 +1059,7 @@ public: BOOL UseDecrement( void ) { -#if defined( CLIENT_WEAPONS ) +#if CLIENT_WEAPONS return TRUE; #else return FALSE;