YGGverse/hlsdk-portable
1
0
Fork 0
mirror of https://github.com/YGGverse/hlsdk-portable.git synced 2025-02-10 22:14:14 +00:00
Code Issues Projects Releases Wiki Activity

#ifdef->#if.

Browse Source
This commit is contained in:
Andrey Akhmichin 2021-06-16 02:15:47 +05:00
parent 91dad7a2ff
commit f6dfc6f497
21 changed files with 64 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cl_dll/hl/hl_weapons.cpp
View File

@ -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 ); HUD_WeaponsPostThink( from, to, cmd, time, random_seed );
} }
#if defined( CLIENT_WEAPONS ) #if CLIENT_WEAPONS
if( cl_lw && cl_lw->value ) if( cl_lw && cl_lw->value )
{ {
HUD_WeaponsPostThink( from, to, cmd, time, random_seed ); HUD_WeaponsPostThink( from, to, cmd, time, random_seed );

4
dlls/hs/ak47.cpp
View File

@ -159,7 +159,7 @@ void CAK47::PrimaryAttack()
Vector vecAiming = m_pPlayer->GetAutoaimVector( AUTOAIM_5DEGREES ); Vector vecAiming = m_pPlayer->GetAutoaimVector( AUTOAIM_5DEGREES );
Vector vecDir; Vector vecDir;
#ifdef CLIENT_DLL #if CLIENT_DLL
if ( bIsMultiplayer() ) if ( bIsMultiplayer() )
#else #else
if ( g_pGameRules->IsMultiplayer() ) if ( g_pGameRules->IsMultiplayer() )
@ -175,7 +175,7 @@ void CAK47::PrimaryAttack()
} }
int flags; int flags;
#if defined( CLIENT_WEAPONS ) #if CLIENT_WEAPONS
flags = FEV_NOTHOST; flags = FEV_NOTHOST;
#else #else
flags = 0; flags = 0;

4
dlls/hs/beamkatana.cpp
View File

@ -207,7 +207,7 @@ int CBeamKatana::Swing( int fFirst )
UTIL_TraceLine( vecSrc, vecEnd, dont_ignore_monsters, ENT( m_pPlayer->pev ), &tr ); UTIL_TraceLine( vecSrc, vecEnd, dont_ignore_monsters, ENT( m_pPlayer->pev ), &tr );
#ifndef CLIENT_DLL #if !CLIENT_DLL
if ( tr.flFraction >= 1.0f ) if ( tr.flFraction >= 1.0f )
{ {
UTIL_TraceHull( vecSrc, vecEnd, dont_ignore_monsters, head_hull, ENT( m_pPlayer->pev ), &tr ); 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 // player "shoot" animation
m_pPlayer->SetAnimation( PLAYER_ATTACK1 ); m_pPlayer->SetAnimation( PLAYER_ATTACK1 );
#ifndef CLIENT_DLL #if !CLIENT_DLL
// hit // hit
fDidHit = TRUE; fDidHit = TRUE;

2
dlls/hs/boombox.cpp
View File

@ -119,7 +119,7 @@ void CBoombox::PrimaryAttack()
void CBoombox::SecondaryAttack() void CBoombox::SecondaryAttack()
{ {
EMIT_SOUND(ENT(m_pPlayer->pev), CHAN_WEAPON, "bbox/songrc.wav", 1, ATTN_NORM); //1.83 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 ); UTIL_ScreenShake( m_pPlayer->pev->origin, 25.0, 200.0, 2, 750 );
#endif #endif
RadiusDamage( m_pPlayer->pev->origin, pev, m_pPlayer->pev, 10, 750, CLASS_NONE, DMG_BILLNYE | DMG_ALWAYSGIB ); RadiusDamage( m_pPlayer->pev->origin, pev, m_pPlayer->pev, 10, 750, CLASS_NONE, DMG_BILLNYE | DMG_ALWAYSGIB );

12
dlls/hs/bow.cpp
View File

@ -12,7 +12,7 @@
* without written permission from Valve LLC. * without written permission from Valve LLC.
* *
****/ ****/
#if !defined( OEM_BUILD ) && !defined( HLDEMO_BUILD ) #if !OEM_BUILD && !HLDEMO_BUILD
#include "extdll.h" #include "extdll.h"
#include "util.h" #include "util.h"
@ -23,7 +23,7 @@
#include "player.h" #include "player.h"
#include "gamerules.h" #include "gamerules.h"
#ifndef CLIENT_DLL #if !CLIENT_DLL
#define BOLT_AIR_VELOCITY 150 #define BOLT_AIR_VELOCITY 150
#define BOLT_WATER_VELOCITY 50 #define BOLT_WATER_VELOCITY 50
@ -328,7 +328,7 @@ void CBow::PrimaryAttack( void )
m_iClip--; m_iClip--;
int flags; int flags;
#if defined( CLIENT_WEAPONS ) #if CLIENT_WEAPONS
flags = FEV_NOTHOST; flags = FEV_NOTHOST;
#else #else
flags = 0; flags = 0;
@ -346,7 +346,7 @@ void CBow::PrimaryAttack( void )
UTIL_TraceLine(vecSrc, vecSrc + vecDir * 8192, dont_ignore_monsters, m_pPlayer->edict(), &tr); UTIL_TraceLine(vecSrc, vecSrc + vecDir * 8192, dont_ignore_monsters, m_pPlayer->edict(), &tr);
#ifndef CLIENT_DLL #if !CLIENT_DLL
if ( tr.pHit->v.takedamage ) if ( tr.pHit->v.takedamage )
{ {
ClearMultiDamage( ); ClearMultiDamage( );
@ -372,7 +372,7 @@ void CBow::FireBolt()
m_pPlayer->m_rgAmmo[ m_iPrimaryAmmoType ]--; m_pPlayer->m_rgAmmo[ m_iPrimaryAmmoType ]--;
int flags; int flags;
#if defined( CLIENT_WEAPONS ) #if CLIENT_WEAPONS
flags = FEV_NOTHOST; flags = FEV_NOTHOST;
#else #else
flags = 0; flags = 0;
@ -390,7 +390,7 @@ void CBow::FireBolt()
Vector vecSrc = m_pPlayer->GetGunPosition( ) - gpGlobals->v_up * 2; Vector vecSrc = m_pPlayer->GetGunPosition( ) - gpGlobals->v_up * 2;
Vector vecDir = gpGlobals->v_forward; Vector vecDir = gpGlobals->v_forward;
#ifndef CLIENT_DLL #if !CLIENT_DLL
CBowBolt *pBolt = CBowBolt::BoltCreate(); CBowBolt *pBolt = CBowBolt::BoltCreate();
pBolt->pev->origin = vecSrc; pBolt->pev->origin = vecSrc;
pBolt->pev->angles = anglesAim; pBolt->pev->angles = anglesAim;

2
dlls/hs/cod_gamerules.cpp
View File

@ -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. // let the killer paint another decal as soon as he'd like.
PK->m_flNextDecalTime = gpGlobals->time; PK->m_flNextDecalTime = gpGlobals->time;
} }
#ifndef HLDEMO_BUILD #if !HLDEMO_BUILD
if ( pVictim->HasNamedPlayerItem("weapon_satchel") ) if ( pVictim->HasNamedPlayerItem("weapon_satchel") )
{ {
DeactivateSatchels( pVictim ); DeactivateSatchels( pVictim );

8
dlls/hs/dosh.cpp
View File

@ -12,7 +12,7 @@
* without written permission from Valve LLC. * without written permission from Valve LLC.
* *
****/ ****/
#if !defined( OEM_BUILD ) #if !OEM_BUILD
#include "extdll.h" #include "extdll.h"
#include "util.h" #include "util.h"
@ -37,7 +37,7 @@ enum dosh_e {
LINK_ENTITY_TO_CLASS( weapon_dosh, CDosh ); LINK_ENTITY_TO_CLASS( weapon_dosh, CDosh );
#ifndef CLIENT_DLL #if !CLIENT_DLL
LINK_ENTITY_TO_CLASS( dosh_rocket, CDoshRocket ); LINK_ENTITY_TO_CLASS( dosh_rocket, CDoshRocket );
//========================================================= //=========================================================
@ -252,7 +252,7 @@ void CDosh::Holster( int skiplocal /* = 0 */ )
SendWeaponAnim( DOSH_THROW3 ); SendWeaponAnim( DOSH_THROW3 );
#ifndef CLIENT_DLL #if !CLIENT_DLL
#endif #endif
@ -270,7 +270,7 @@ void CDosh::PrimaryAttack()
gpGlobals->v_forward * 512 ); gpGlobals->v_forward * 512 );
int flags; int flags;
#if defined( CLIENT_WEAPONS ) #if CLIENT_WEAPONS
flags = FEV_NOTHOST; flags = FEV_NOTHOST;
#else #else
flags = 0; flags = 0;

4
dlls/hs/fotn.cpp
View File

@ -176,7 +176,7 @@ int CFOTN::Swing( int fFirst )
UTIL_TraceLine( vecSrc, vecEnd, dont_ignore_monsters, ENT( m_pPlayer->pev ), &tr ); UTIL_TraceLine( vecSrc, vecEnd, dont_ignore_monsters, ENT( m_pPlayer->pev ), &tr );
#ifndef CLIENT_DLL #if !CLIENT_DLL
if ( tr.flFraction >= 1.0 ) if ( tr.flFraction >= 1.0 )
{ {
UTIL_TraceHull( vecSrc, vecEnd, dont_ignore_monsters, head_hull, ENT( m_pPlayer->pev ), &tr ); 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 // player "shoot" animation
m_pPlayer->SetAnimation( PLAYER_ATTACK1 ); m_pPlayer->SetAnimation( PLAYER_ATTACK1 );
#ifndef CLIENT_DLL #if !CLIENT_DLL
// hit // hit
fDidHit = TRUE; fDidHit = TRUE;

4
dlls/hs/fotns.cpp
View File

@ -232,7 +232,7 @@ int CFOTN::Swing( int fFirst )
UTIL_TraceLine( vecSrc, vecEnd, dont_ignore_monsters, ENT( m_pPlayer->pev ), &tr ); UTIL_TraceLine( vecSrc, vecEnd, dont_ignore_monsters, ENT( m_pPlayer->pev ), &tr );
#ifndef CLIENT_DLL #if !CLIENT_DLL
if ( tr.flFraction >= 1.0f ) if ( tr.flFraction >= 1.0f )
{ {
UTIL_TraceHull( vecSrc, vecEnd, dont_ignore_monsters, head_hull, ENT( m_pPlayer->pev ), &tr ); 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 // player "shoot" animation
m_pPlayer->SetAnimation( PLAYER_ATTACK1 ); m_pPlayer->SetAnimation( PLAYER_ATTACK1 );
#ifndef CLIENT_DLL #if !CLIENT_DLL
// hit // hit
fDidHit = TRUE; fDidHit = TRUE;

2
dlls/hs/goldengun.cpp
View File

@ -98,7 +98,7 @@ void CGOLDENGUN::GOLDENGUNFire( float flSpread , float flCycleTime, BOOL fUseAut
m_pPlayer->pev->effects = (int)(m_pPlayer->pev->effects) | EF_MUZZLEFLASH; m_pPlayer->pev->effects = (int)(m_pPlayer->pev->effects) | EF_MUZZLEFLASH;
int flags; int flags;
#if defined( CLIENT_WEAPONS ) #if CLIENT_WEAPONS
flags = FEV_NOTHOST; flags = FEV_NOTHOST;
#else #else
flags = 0; flags = 0;

2
dlls/hs/jackal.cpp
View File

@ -96,7 +96,7 @@ void CJackal::JackalFire( float flSpread , float flCycleTime, BOOL fUseAutoAim )
m_pPlayer->pev->effects = (int)(m_pPlayer->pev->effects) | EF_MUZZLEFLASH; m_pPlayer->pev->effects = (int)(m_pPlayer->pev->effects) | EF_MUZZLEFLASH;
int flags; int flags;
#if defined( CLIENT_WEAPONS ) #if CLIENT_WEAPONS
flags = FEV_NOTHOST; flags = FEV_NOTHOST;
#else #else
flags = 0; flags = 0;

4
dlls/hs/jihad.cpp
View File

@ -45,7 +45,7 @@ void CJihad::Spawn( )
m_iId = WEAPON_JIHAD; m_iId = WEAPON_JIHAD;
SET_MODEL(ENT(pev), "models/w_jihad.mdl"); SET_MODEL(ENT(pev), "models/w_jihad.mdl");
#ifndef CLIENT_DLL #if !CLIENT_DLL
pev->dmg = gSkillData.plrDmgJihad; pev->dmg = gSkillData.plrDmgJihad;
#endif #endif
@ -112,7 +112,7 @@ void CJihad::PrimaryAttack()
SendWeaponAnim( JIHAD_SHOOT3 ); SendWeaponAnim( JIHAD_SHOOT3 );
lolalo = FALSE; lolalo = FALSE;
m_pPlayer->m_flNextAttack = UTIL_WeaponTimeBase() + 2; m_pPlayer->m_flNextAttack = UTIL_WeaponTimeBase() + 2;
#ifdef CLIENT_DLL #if CLIENT_DLL
//Genuflect //Genuflect
#else #else
ExplosionCreate( m_pPlayer->Center(), m_pPlayer->pev->angles, m_pPlayer->edict(), 1080, TRUE ); // BOOM! ExplosionCreate( m_pPlayer->Center(), m_pPlayer->pev->angles, m_pPlayer->edict(), 1080, TRUE ); // BOOM!

14
dlls/hs/modman.cpp
View File

@ -12,7 +12,7 @@
* without written permission from Valve LLC. * without written permission from Valve LLC.
* *
****/ ****/
#if !defined( OEM_BUILD ) && !defined( HLDEMO_BUILD ) #if !OEM_BUILD && !HLDEMO_BUILD
#include "extdll.h" #include "extdll.h"
#include "util.h" #include "util.h"
@ -23,7 +23,7 @@
#include "player.h" #include "player.h"
#include "gamerules.h" #include "gamerules.h"
#ifndef CLIENT_DLL #if !CLIENT_DLL
#define HORN_AIR_VELOCITY 1800 #define HORN_AIR_VELOCITY 1800
#define HORN_WATER_VELOCITY 1600 #define HORN_WATER_VELOCITY 1600
@ -316,7 +316,7 @@ void CModman::Holster( int skiplocal /* = 0 */ )
void CModman::PrimaryAttack( void ) void CModman::PrimaryAttack( void )
{ {
/*#ifdef CLIENT_DLL /*#if CLIENT_DLL
if ( bIsMultiplayer() ) if ( bIsMultiplayer() )
#else #else
if (g_pGameRules->IsMultiplayer()) if (g_pGameRules->IsMultiplayer())
@ -346,7 +346,7 @@ void CModman::FireSniperHorn()
m_iClip--; m_iClip--;
int flags; int flags;
#if defined( CLIENT_WEAPONS ) #if CLIENT_WEAPONS
flags = FEV_NOTHOST; flags = FEV_NOTHOST;
#else #else
flags = 0; flags = 0;
@ -364,7 +364,7 @@ void CModman::FireSniperHorn()
UTIL_TraceLine(vecSrc, vecSrc + vecDir * 8192, dont_ignore_monsters, m_pPlayer->edict(), &tr); UTIL_TraceLine(vecSrc, vecSrc + vecDir * 8192, dont_ignore_monsters, m_pPlayer->edict(), &tr);
#ifndef CLIENT_DLL #if !CLIENT_DLL
if ( tr.pHit->v.takedamage ) if ( tr.pHit->v.takedamage )
{ {
ClearMultiDamage( ); ClearMultiDamage( );
@ -389,7 +389,7 @@ void CModman::FireHorn()
m_iClip--; m_iClip--;
int flags; int flags;
#if defined( CLIENT_WEAPONS ) #if CLIENT_WEAPONS
flags = FEV_NOTHOST; flags = FEV_NOTHOST;
#else #else
flags = 0; flags = 0;
@ -407,7 +407,7 @@ void CModman::FireHorn()
Vector vecSrc = m_pPlayer->GetGunPosition( ) - gpGlobals->v_up * 2; Vector vecSrc = m_pPlayer->GetGunPosition( ) - gpGlobals->v_up * 2;
Vector vecDir = gpGlobals->v_forward; Vector vecDir = gpGlobals->v_forward;
#ifndef CLIENT_DLL #if !CLIENT_DLL
CModmanHorn *pHorn = CModmanHorn::HornCreate(); CModmanHorn *pHorn = CModmanHorn::HornCreate();
pHorn->pev->origin = vecSrc; pHorn->pev->origin = vecSrc;
pHorn->pev->angles = anglesAim; pHorn->pev->angles = anglesAim;

6
dlls/hs/monhunt_gamerules.cpp
View File

@ -21,7 +21,7 @@
#include "player.h" #include "player.h"
#include "weapons.h" #include "weapons.h"
#include "gamerules.h" #include "gamerules.h"
#ifndef NO_VOICEGAMEMGR #if !NO_VOICEGAMEMGR
#include "voice_gamemgr.h" #include "voice_gamemgr.h"
#endif #endif
#include "monhunt_gamerules.h" #include "monhunt_gamerules.h"
@ -41,11 +41,11 @@ void CMonsterplay::Think( void )
{ {
// longest the intermission can last, in seconds // longest the intermission can last, in seconds
#define MAX_INTERMISSION_TIME 120 #define MAX_INTERMISSION_TIME 120
#ifndef NO_VOICEGAMEMGR #if !NO_VOICEGAMEMGR
CVoiceGameMgr g_VoiceGameMgr; CVoiceGameMgr g_VoiceGameMgr;
#endif #endif
float g_flIntermissionStartTime = 0; float g_flIntermissionStartTime = 0;
#ifndef NO_VOICEGAMEMGR #if !NO_VOICEGAMEMGR
g_VoiceGameMgr.Update(gpGlobals->frametime); g_VoiceGameMgr.Update(gpGlobals->frametime);
#endif #endif
///// Check game rules ///// ///// Check game rules /////

6
dlls/hs/mw2.cpp
View File

@ -143,7 +143,7 @@ void CMW2::PrimaryAttack()
Vector vecAiming = m_pPlayer->GetAutoaimVector( AUTOAIM_5DEGREES ); Vector vecAiming = m_pPlayer->GetAutoaimVector( AUTOAIM_5DEGREES );
Vector vecDir; Vector vecDir;
#ifdef CLIENT_DLL #if CLIENT_DLL
if ( bIsMultiplayer() ) if ( bIsMultiplayer() )
#else #else
if ( g_pGameRules->IsMultiplayer() ) if ( g_pGameRules->IsMultiplayer() )
@ -159,13 +159,13 @@ void CMW2::PrimaryAttack()
} }
int flags; int flags;
#if defined( CLIENT_WEAPONS ) #if CLIENT_WEAPONS
flags = FEV_NOTHOST; flags = FEV_NOTHOST;
#else #else
flags = 0; flags = 0;
#endif #endif
#ifndef CLIENT_DLL #if !CLIENT_DLL
UTIL_ScreenShake( m_pPlayer->pev->origin, 250.0, 200.0, 2.5, 1 ); UTIL_ScreenShake( m_pPlayer->pev->origin, 250.0, 200.0, 2.5, 1 );
#endif #endif

8
dlls/hs/nstar.cpp
View File

@ -12,7 +12,7 @@
* without written permission from Valve LLC. * without written permission from Valve LLC.
* *
****/ ****/
#if !defined( OEM_BUILD ) && !defined( HLDEMO_BUILD ) #if !OEM_BUILD && !HLDEMO_BUILD
#include "extdll.h" #include "extdll.h"
#include "util.h" #include "util.h"
@ -23,7 +23,7 @@
#include "player.h" #include "player.h"
#include "gamerules.h" #include "gamerules.h"
#ifndef CLIENT_DLL #if !CLIENT_DLL
#define STAR_AIR_VELOCITY 1500 #define STAR_AIR_VELOCITY 1500
#define STAR_WATER_VELOCITY 150 #define STAR_WATER_VELOCITY 150
@ -305,7 +305,7 @@ void CNStar::FireStar()
m_pPlayer->m_rgAmmo[ m_iPrimaryAmmoType ]--; m_pPlayer->m_rgAmmo[ m_iPrimaryAmmoType ]--;
int flags; int flags;
#if defined( CLIENT_WEAPONS ) #if CLIENT_WEAPONS
flags = FEV_NOTHOST; flags = FEV_NOTHOST;
#else #else
flags = 0; flags = 0;
@ -323,7 +323,7 @@ void CNStar::FireStar()
Vector vecSrc = m_pPlayer->GetGunPosition( ) - gpGlobals->v_up * 2; Vector vecSrc = m_pPlayer->GetGunPosition( ) - gpGlobals->v_up * 2;
Vector vecDir = gpGlobals->v_forward; Vector vecDir = gpGlobals->v_forward;
#ifndef CLIENT_DLL #if !CLIENT_DLL
CNinjaStar *pStar = CNinjaStar::StarCreate(); CNinjaStar *pStar = CNinjaStar::StarCreate();
pStar->pev->origin = vecSrc; pStar->pev->origin = vecSrc;
pStar->pev->angles = anglesAim; pStar->pev->angles = anglesAim;

8
dlls/hs/scipg.cpp
View File

@ -12,7 +12,7 @@
* without written permission from Valve LLC. * without written permission from Valve LLC.
* *
****/ ****/
#if !defined( OEM_BUILD ) && !defined( HLDEMO_BUILD ) #if !OEM_BUILD && !HLDEMO_BUILD
#include "extdll.h" #include "extdll.h"
#include "util.h" #include "util.h"
@ -23,7 +23,7 @@
#include "player.h" #include "player.h"
#include "gamerules.h" #include "gamerules.h"
#ifndef CLIENT_DLL #if !CLIENT_DLL
#define BOLT_AIR_VELOCITY 800 #define BOLT_AIR_VELOCITY 800
#define BOLT_WATER_VELOCITY 450 #define BOLT_WATER_VELOCITY 450
@ -328,7 +328,7 @@ void CSciPG::FireBolt()
m_pPlayer->m_rgAmmo[ m_iPrimaryAmmoType ]--; m_pPlayer->m_rgAmmo[ m_iPrimaryAmmoType ]--;
int flags; int flags;
#if defined( CLIENT_WEAPONS ) #if CLIENT_WEAPONS
flags = FEV_NOTHOST; flags = FEV_NOTHOST;
#else #else
flags = 0; flags = 0;
@ -346,7 +346,7 @@ void CSciPG::FireBolt()
Vector vecSrc = m_pPlayer->GetGunPosition( ) - gpGlobals->v_up * 2; Vector vecSrc = m_pPlayer->GetGunPosition( ) - gpGlobals->v_up * 2;
Vector vecDir = gpGlobals->v_forward; Vector vecDir = gpGlobals->v_forward;
#ifndef CLIENT_DLL #if !CLIENT_DLL
CSciPGBolt *pBolt = CSciPGBolt::BoltCreate(); CSciPGBolt *pBolt = CSciPGBolt::BoltCreate();
pBolt->pev->origin = vecSrc; pBolt->pev->origin = vecSrc;
pBolt->pev->angles = anglesAim; pBolt->pev->angles = anglesAim;

6
dlls/hs/shytplay_gamerules.cpp
View File

@ -75,7 +75,7 @@ CHalfLifeShytplay :: CHalfLifeShytplay()
extern cvar_t timeleft, fragsleft; extern cvar_t timeleft, fragsleft;
#ifndef NO_VOICEGAMEMGR #if !NO_VOICEGAMEMGR
#include "voice_gamemgr.h" #include "voice_gamemgr.h"
extern CVoiceGameMgr g_VoiceGameMgr; extern CVoiceGameMgr g_VoiceGameMgr;
#endif #endif
@ -88,7 +88,7 @@ void CHalfLifeShytplay :: Think ( void )
int frags_remaining = 0; int frags_remaining = 0;
int time_remaining = 0; int time_remaining = 0;
#ifndef NO_VOICEGAMEMGR #if !NO_VOICEGAMEMGR
g_VoiceGameMgr.Update(gpGlobals->frametime); g_VoiceGameMgr.Update(gpGlobals->frametime);
#endif #endif
if ( g_fGameOver ) // someone else quit the game already 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 ) BOOL CHalfLifeShytplay :: ClientCommand( CBasePlayer *pPlayer, const char *pcmd )
{ {
#ifndef NO_VOICEGAMEMGR #if !NO_VOICEGAMEMGR
if(g_VoiceGameMgr.ClientCommand(pPlayer, pcmd)) if(g_VoiceGameMgr.ClientCommand(pPlayer, pcmd))
return TRUE; return TRUE;
#endif #endif

4
dlls/hs/soda_can.cpp
View File

@ -67,7 +67,7 @@ int CSodaCan::AddToPlayer( CBasePlayer *pPlayer )
if ( CBasePlayerWeapon::AddToPlayer( pPlayer ) ) if ( CBasePlayerWeapon::AddToPlayer( pPlayer ) )
{ {
#ifndef CLIENT_DLL #if !CLIENT_DLL
if ( g_pGameRules->IsMultiplayer() ) if ( g_pGameRules->IsMultiplayer() )
{ {
// in multiplayer, all hivehands come full. // in multiplayer, all hivehands come full.
@ -124,7 +124,7 @@ void CSodaCan::PrimaryAttack()
m_pPlayer->m_iWeaponVolume = NORMAL_GUN_VOLUME; m_pPlayer->m_iWeaponVolume = NORMAL_GUN_VOLUME;
int flags; int flags;
#if defined( CLIENT_WEAPONS ) #if CLIENT_WEAPONS
flags = FEV_NOTHOST; flags = FEV_NOTHOST;
#else #else
flags = 0; flags = 0;

2
dlls/hs/zapper.cpp
View File

@ -93,7 +93,7 @@ void CZAPPER::ZAPPERFire( float flSpread , float flCycleTime, BOOL fUseAutoAim )
m_pPlayer->pev->effects = (int)(m_pPlayer->pev->effects) | EF_MUZZLEFLASH; m_pPlayer->pev->effects = (int)(m_pPlayer->pev->effects) | EF_MUZZLEFLASH;
int flags; int flags;
#if defined( CLIENT_WEAPONS ) #if CLIENT_WEAPONS
flags = FEV_NOTHOST; flags = FEV_NOTHOST;
#else #else
flags = 0; flags = 0;

24
dlls/weapons.h
View File

@ -861,7 +861,7 @@ public:
// //
// virtual BOOL UseDecrement( void ) // virtual BOOL UseDecrement( void )
// { // {
//#if defined( CLIENT_WEAPONS ) //#if CLIENT_WEAPONS
// return TRUE; // return TRUE;
//#else //#else
// return FALSE; // return FALSE;
@ -888,7 +888,7 @@ public:
virtual BOOL UseDecrement( void ) virtual BOOL UseDecrement( void )
{ {
#if defined( CLIENT_WEAPONS ) #if CLIENT_WEAPONS
return TRUE; return TRUE;
#else #else
return FALSE; return FALSE;
@ -914,7 +914,7 @@ public:
virtual BOOL UseDecrement( void ) virtual BOOL UseDecrement( void )
{ {
#if defined( CLIENT_WEAPONS ) #if CLIENT_WEAPONS
return TRUE; return TRUE;
#else #else
return FALSE; return FALSE;
@ -949,7 +949,7 @@ public:
virtual BOOL UseDecrement( void ) virtual BOOL UseDecrement( void )
{ {
#if defined( CLIENT_WEAPONS ) #if CLIENT_WEAPONS
return TRUE; return TRUE;
#else #else
return FALSE; return FALSE;
@ -979,7 +979,7 @@ public:
virtual BOOL UseDecrement( void ) virtual BOOL UseDecrement( void )
{ {
#if defined( CLIENT_WEAPONS ) #if CLIENT_WEAPONS
return TRUE; return TRUE;
#else #else
return FALSE; return FALSE;
@ -1054,7 +1054,7 @@ public:
virtual BOOL UseDecrement( void ) virtual BOOL UseDecrement( void )
{ {
#if defined( CLIENT_WEAPONS ) #if CLIENT_WEAPONS
return TRUE; return TRUE;
#else #else
return FALSE; return FALSE;
@ -1135,7 +1135,7 @@ public:
virtual BOOL UseDecrement( void ) virtual BOOL UseDecrement( void )
{ {
#if defined( CLIENT_WEAPONS ) #if CLIENT_WEAPONS
return TRUE; return TRUE;
#else #else
return FALSE; return FALSE;
@ -1165,7 +1165,7 @@ public:
BOOL UseDecrement( void ) BOOL UseDecrement( void )
{ {
#if defined( CLIENT_WEAPONS ) #if CLIENT_WEAPONS
return TRUE; return TRUE;
#else #else
return FALSE; return FALSE;
@ -1262,7 +1262,7 @@ public:
virtual BOOL UseDecrement( void ) virtual BOOL UseDecrement( void )
{ {
#if defined( CLIENT_WEAPONS ) #if CLIENT_WEAPONS
return TRUE; return TRUE;
#else #else
return FALSE; return FALSE;
@ -1291,7 +1291,7 @@ public:
virtual BOOL UseDecrement( void ) virtual BOOL UseDecrement( void )
{ {
#if defined( CLIENT_WEAPONS ) #if CLIENT_WEAPONS
return TRUE; return TRUE;
#else #else
return FALSE; return FALSE;
@ -1352,7 +1352,7 @@ public:
virtual BOOL UseDecrement( void ) virtual BOOL UseDecrement( void )
{ {
#if defined( CLIENT_WEAPONS ) #if CLIENT_WEAPONS
return TRUE; return TRUE;
#else #else
return FALSE; return FALSE;
@ -1417,7 +1417,7 @@ public:
virtual BOOL UseDecrement( void ) virtual BOOL UseDecrement( void )
{ {
#if defined( CLIENT_WEAPONS ) #if CLIENT_WEAPONS
return TRUE; return TRUE;
#else #else
return FALSE; return FALSE;