Browse Source

#ifdef->#if.

CAd
Andrey Akhmichin 4 years ago
parent
commit
1f2e96fddc
  1. 14
      dlls/CAd/displacer.cpp
  2. 10
      dlls/CAd/eagle.cpp
  3. 8
      dlls/weapons.h

14
dlls/CAd/displacer.cpp

@ -22,7 +22,7 @@
#include "gamerules.h" #include "gamerules.h"
#include "shake.h" #include "shake.h"
#ifndef CLIENT_DLL #if !CLIENT_DLL
extern edict_t *EntSelectSpawnPoint( CBaseEntity *pPlayer ); extern edict_t *EntSelectSpawnPoint( CBaseEntity *pPlayer );
@ -305,7 +305,7 @@ void CDisplacerBall::ClearBeams( void )
} }
#endif // !defined ( CLIENT_DLL ) #endif // !CLIENT_DLL
enum displacer_e { enum displacer_e {
DISPLACER_IDLE1 = 0, DISPLACER_IDLE1 = 0,
@ -407,7 +407,7 @@ void CDisplacer::Precache(void)
PRECACHE_MODEL("sprites/lgtning.spr"); PRECACHE_MODEL("sprites/lgtning.spr");
#ifndef CLIENT_DLL #if !CLIENT_DLL
iPortalSprite = PRECACHE_MODEL("sprites/exit1.spr"); iPortalSprite = PRECACHE_MODEL("sprites/exit1.spr");
iRingSprite = PRECACHE_MODEL("sprites/displacer_ring.spr"); iRingSprite = PRECACHE_MODEL("sprites/displacer_ring.spr");
#endif #endif
@ -563,7 +563,7 @@ void CDisplacer::Displace( void )
m_pPlayer->SetAnimation( PLAYER_ATTACK1 ); m_pPlayer->SetAnimation( PLAYER_ATTACK1 );
m_pPlayer->pev->punchangle.x -= 2; m_pPlayer->pev->punchangle.x -= 2;
#ifndef CLIENT_DLL #if !CLIENT_DLL
Vector vecSrc; Vector vecSrc;
UseAmmo(DISPLACER_PRIMARY_USAGE); UseAmmo(DISPLACER_PRIMARY_USAGE);
@ -588,7 +588,7 @@ void CDisplacer::Teleport( void )
const char *pszName; const char *pszName;
ClearBeams(); ClearBeams();
ClearSpin(); ClearSpin();
#ifndef CLIENT_DLL #if !CLIENT_DLL
CBaseEntity *pTarget = NULL; CBaseEntity *pTarget = NULL;
Vector tmp( 0, 0, 0 ); Vector tmp( 0, 0, 0 );
@ -657,7 +657,7 @@ void CDisplacer::Teleport( void )
void CDisplacer::LightningEffect( void ) void CDisplacer::LightningEffect( void )
{ {
#ifndef CLIENT_DLL #if !CLIENT_DLL
int m_iBeams = 0; int m_iBeams = 0;
for( int i = 2; i < 5; ++i ) for( int i = 2; i < 5; ++i )
@ -679,7 +679,7 @@ void CDisplacer::LightningEffect( void )
void CDisplacer::ClearBeams( void ) void CDisplacer::ClearBeams( void )
{ {
#ifndef CLIENT_DLL #if !CLIENT_DLL
for( int i = 0; i < 3; i++ ) for( int i = 0; i < 3; i++ )
{ {
if( m_pBeam[i] ) if( m_pBeam[i] )

10
dlls/CAd/eagle.cpp

@ -29,7 +29,7 @@ enum deagle_e {
}; };
LINK_ENTITY_TO_CLASS( weapon_eagle, CEagle ) LINK_ENTITY_TO_CLASS( weapon_eagle, CEagle )
#ifndef CLIENT_DLL #if !CLIENT_DLL
LINK_ENTITY_TO_CLASS( eagle_laser, CLaserSpot ) LINK_ENTITY_TO_CLASS( eagle_laser, CLaserSpot )
#endif #endif
@ -158,7 +158,7 @@ void CEagle::PrimaryAttack()
int flags; int flags;
BOOL m_fLaserOn; BOOL m_fLaserOn;
#if defined( CLIENT_WEAPONS ) #if CLIENT_WEAPONS
flags = FEV_NOTHOST; flags = FEV_NOTHOST;
#else #else
flags = 0; flags = 0;
@ -178,7 +178,7 @@ void CEagle::PrimaryAttack()
{ {
vecDir = m_pPlayer->FireBulletsPlayer( 1, vecSrc, vecAiming, Vector( flSpread, flSpread, flSpread ), 8192, BULLET_PLAYER_357, 0, 0, m_pPlayer->pev, m_pPlayer->random_seed ); vecDir = m_pPlayer->FireBulletsPlayer( 1, vecSrc, vecAiming, Vector( flSpread, flSpread, flSpread ), 8192, BULLET_PLAYER_357, 0, 0, m_pPlayer->pev, m_pPlayer->random_seed );
m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.5f; m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.5f;
#ifndef CLIENT_DLL #if !CLIENT_DLL
m_pEagleLaser->Suspend( 0.6 ); m_pEagleLaser->Suspend( 0.6 );
#endif #endif
m_fLaserOn = TRUE; m_fLaserOn = TRUE;
@ -208,7 +208,7 @@ void CEagle::Reload( void )
if ( m_pEagleLaser && m_fEagleLaserActive ) if ( m_pEagleLaser && m_fEagleLaserActive )
{ {
#ifndef CLIENT_DLL #if !CLIENT_DLL
m_pEagleLaser->Suspend( 1.6f ); m_pEagleLaser->Suspend( 1.6f );
#endif #endif
m_flNextSecondaryAttack = UTIL_WeaponTimeBase() + 1.5f; m_flNextSecondaryAttack = UTIL_WeaponTimeBase() + 1.5f;
@ -229,7 +229,7 @@ void CEagle::Reload( void )
void CEagle::UpdateSpot( void ) void CEagle::UpdateSpot( void )
{ {
#ifndef CLIENT_DLL #if !CLIENT_DLL
if (m_fEagleLaserActive) if (m_fEagleLaserActive)
{ {
if (!m_pEagleLaser) if (!m_pEagleLaser)

8
dlls/weapons.h

@ -1013,7 +1013,7 @@ class CDisplacer : public CBasePlayerWeapon
{ {
public: public:
#ifndef CLIENT_DLL #if !CLIENT_DLL
int Save(CSave &save); int Save(CSave &save);
int Restore(CRestore &restore); int Restore(CRestore &restore);
static TYPEDESCRIPTION m_SaveData[]; static TYPEDESCRIPTION m_SaveData[];
@ -1033,7 +1033,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;
@ -1061,7 +1061,7 @@ class CEagle : public CBasePlayerWeapon
{ {
public: public:
#ifndef CLIENT_DLL #if !CLIENT_DLL
int Save( CSave &save ); int Save( CSave &save );
int Restore( CRestore &restore ); int Restore( CRestore &restore );
static TYPEDESCRIPTION m_SaveData[]; static TYPEDESCRIPTION m_SaveData[];
@ -1085,7 +1085,7 @@ public:
int m_fEagleLaserActive; int m_fEagleLaserActive;
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;

Loading…
Cancel
Save