YGGverse
/
hlsdk-portable
mirror of https://github.com/YGGverse/hlsdk-portable.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

#ifdef->#if.

aomdc
Andrey Akhmichin 4 years ago
parent
6d7ba86b53
commit
91fa611d06
14 changed files with 24 additions and 25 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      cl_dll/hl/hl_weapons.cpp
  2. 6
      dlls/aomdc/axe.cpp
  3. 2
      dlls/aomdc/beretta.cpp
  4. 2
      dlls/aomdc/deagle.cpp
  5. 2
      dlls/aomdc/glock.cpp
  6. 2
      dlls/aomdc/gmgeneral.cpp
  7. 6
      dlls/aomdc/hammer.cpp
  8. 6
      dlls/aomdc/knife.cpp
  9. 2
      dlls/aomdc/mp5k.cpp
  10. 2
      dlls/aomdc/p228.cpp
  11. 4
      dlls/aomdc/revolver.cpp
  12. 6
      dlls/aomdc/spear.cpp
  13. 2
      dlls/aomdc/uzi.cpp
  14. 3
      dlls/weapons.h

2
cl_dll/hl/hl_weapons.cpp
Unescape View File

@ -1031,7 +1031,7 @@ void _DLLEXPORT HUD_PostRunCmd( struct local_state_s *from, struct local_state_s
{ {
g_runfuncs = runfuncs; g_runfuncs = runfuncs;
#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 );

6
dlls/aomdc/axe.cpp
Unescape View File

@ -143,7 +143,7 @@ void CAxe::PrimaryAttack()
{ {
if (! Swing( 1 )) if (! Swing( 1 ))
{ {
#ifndef CLIENT_DLL #if !CLIENT_DLL
SetThink(&CAxe:: SwingAgain ); SetThink(&CAxe:: SwingAgain );
SetNextThink( 0.1 ); SetNextThink( 0.1 );
#endif #endif
@ -175,7 +175,7 @@ int CAxe::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 );
@ -214,7 +214,7 @@ int CAxe::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/aomdc/beretta.cpp
Unescape View File

@ -123,7 +123,7 @@ void CBeretta::PrimaryAttack( void )
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/aomdc/deagle.cpp
Unescape View File

@ -117,7 +117,7 @@ void CDeagle::PrimaryAttack( void )
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/aomdc/glock.cpp
Unescape View File

@ -136,7 +136,7 @@ void CGlock::GlockFire( float flSpread, float flCycleTime, BOOL fUseBurst )
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/aomdc/gmgeneral.cpp
Unescape View File

@ -134,7 +134,7 @@ void CGMGeneral::PrimaryAttack()
Vector vecDir = m_pPlayer->FireBulletsPlayer( 1, vecSrc, vecAiming, VECTOR_CONE_3DEGREES, 8192, BULLET_PLAYER_MP5, 2, gSkillData.plrDmgMP5K, m_pPlayer->pev, m_pPlayer->random_seed ); Vector vecDir = m_pPlayer->FireBulletsPlayer( 1, vecSrc, vecAiming, VECTOR_CONE_3DEGREES, 8192, BULLET_PLAYER_MP5, 2, gSkillData.plrDmgMP5K, m_pPlayer->pev, m_pPlayer->random_seed );
int flags; int flags;
#if defined( CLIENT_WEAPONS ) #if CLIENT_WEAPONS
flags = FEV_NOTHOST; flags = FEV_NOTHOST;
#else #else
flags = 0; flags = 0;

6
dlls/aomdc/hammer.cpp
Unescape View File

@ -143,7 +143,7 @@ void CHammer::PrimaryAttack()
{ {
m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 1.7f; m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 1.7f;
SendWeaponAnim( HAMMER_WHACK ); SendWeaponAnim( HAMMER_WHACK );
#ifndef CLIENT_DLL #if !CLIENT_DLL
SetThink( &CHammer::BigWhackThink ); SetThink( &CHammer::BigWhackThink );
pev->nextthink = gpGlobals->time + 0.45f; pev->nextthink = gpGlobals->time + 0.45f;
#endif #endif
@ -159,7 +159,7 @@ void CHammer::BigWhackThink()
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 );
@ -183,7 +183,7 @@ void CHammer::BigWhackThink()
// player "shoot" animation // player "shoot" animation
m_pPlayer->SetAnimation( PLAYER_ATTACK1 ); m_pPlayer->SetAnimation( PLAYER_ATTACK1 );
#ifndef CLIENT_DLL #if !CLIENT_DLL
// hit // hit
CBaseEntity *pEntity = CBaseEntity::Instance(tr.pHit); CBaseEntity *pEntity = CBaseEntity::Instance(tr.pHit);

6
dlls/aomdc/knife.cpp
Unescape View File

@ -154,7 +154,7 @@ void CKnife::PrimaryAttack()
{ {
if (! Swing( 1 )) if (! Swing( 1 ))
{ {
#ifndef CLIENT_DLL #if !CLIENT_DLL
SetThink(&CKnife:: SwingAgain ); SetThink(&CKnife:: SwingAgain );
SetNextThink( 0.1 ); SetNextThink( 0.1 );
#endif #endif
@ -186,7 +186,7 @@ int CKnife::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 );
@ -231,7 +231,7 @@ int CKnife::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/aomdc/mp5k.cpp
Unescape View File

@ -144,7 +144,7 @@ void CMP5K::PrimaryAttack()
Vector vecDir = m_pPlayer->FireBulletsPlayer( 1, vecSrc, vecAiming, VECTOR_CONE_3DEGREES, 8192, BULLET_PLAYER_MP5, 2, gSkillData.plrDmgMP5K, m_pPlayer->pev, m_pPlayer->random_seed ); Vector vecDir = m_pPlayer->FireBulletsPlayer( 1, vecSrc, vecAiming, VECTOR_CONE_3DEGREES, 8192, BULLET_PLAYER_MP5, 2, gSkillData.plrDmgMP5K, m_pPlayer->pev, m_pPlayer->random_seed );
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/aomdc/p228.cpp
Unescape View File

@ -121,7 +121,7 @@ void CP228::PrimaryAttack( void )
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/aomdc/revolver.cpp
Unescape 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"
@ -131,7 +131,7 @@ void CRevolver::PrimaryAttack()
Vector vecDir = m_pPlayer->FireBulletsPlayer( 1, vecSrc, vecAiming, VECTOR_CONE_1DEGREES, 8192, BULLET_PLAYER_357, 0, gSkillData.plrDmgRevolver, m_pPlayer->pev, m_pPlayer->random_seed ); Vector vecDir = m_pPlayer->FireBulletsPlayer( 1, vecSrc, vecAiming, VECTOR_CONE_1DEGREES, 8192, BULLET_PLAYER_357, 0, gSkillData.plrDmgRevolver, m_pPlayer->pev, m_pPlayer->random_seed );
int flags; int flags;
#if defined( CLIENT_WEAPONS ) #if CLIENT_WEAPONS
flags = FEV_NOTHOST; flags = FEV_NOTHOST;
#else #else
flags = 0; flags = 0;

6
dlls/aomdc/spear.cpp
Unescape View File

@ -151,7 +151,7 @@ void CSpear::PrimaryAttack()
{ {
SendWeaponAnim( SPEAR_ELECTROCUTE ); SendWeaponAnim( SPEAR_ELECTROCUTE );
m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 2.34f; m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 2.34f;
#ifndef CLIENT_DLL #if !CLIENT_DLL
UTIL_ScreenFade( m_pPlayer, Vector( 255, 255, 255 ), 0.5, 0.0, 100, FFADE_IN ); UTIL_ScreenFade( m_pPlayer, Vector( 255, 255, 255 ), 0.5, 0.0, 100, FFADE_IN );
m_pPlayer->TakeDamage(m_pPlayer->pev, m_pPlayer->pev, DAMAGE_AIM, DMG_GENERIC ); m_pPlayer->TakeDamage(m_pPlayer->pev, m_pPlayer->pev, DAMAGE_AIM, DMG_GENERIC );
EMIT_SOUND(ENT(m_pPlayer->pev), CHAN_ITEM, "weapons/spear_electrocute.wav", 1, ATTN_NORM); EMIT_SOUND(ENT(m_pPlayer->pev), CHAN_ITEM, "weapons/spear_electrocute.wav", 1, ATTN_NORM);
@ -181,7 +181,7 @@ void CSpear::BigSpearStab()
Vector vecEnd = vecSrc + gpGlobals->v_forward * 72; Vector vecEnd = vecSrc + gpGlobals->v_forward * 72;
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 );
@ -207,7 +207,7 @@ void CSpear::BigSpearStab()
// player "shoot" animation // player "shoot" animation
m_pPlayer->SetAnimation( PLAYER_ATTACK1 ); m_pPlayer->SetAnimation( PLAYER_ATTACK1 );
#ifndef CLIENT_DLL #if !CLIENT_DLL
// hit // hit
CBaseEntity *pEntity = CBaseEntity::Instance(tr.pHit); CBaseEntity *pEntity = CBaseEntity::Instance(tr.pHit);

2
dlls/aomdc/uzi.cpp
Unescape View File

@ -141,7 +141,7 @@ void CUzi::PrimaryAttack()
Vector vecDir = m_pPlayer->FireBulletsPlayer( 1, vecSrc, vecAiming, VECTOR_CONE_3DEGREES, 8192, BULLET_PLAYER_MP5, 2, gSkillData.plrDmgUzi, m_pPlayer->pev, m_pPlayer->random_seed ); Vector vecDir = m_pPlayer->FireBulletsPlayer( 1, vecSrc, vecAiming, VECTOR_CONE_3DEGREES, 8192, BULLET_PLAYER_MP5, 2, gSkillData.plrDmgUzi, m_pPlayer->pev, m_pPlayer->random_seed );
int flags; int flags;
#if defined( CLIENT_WEAPONS ) #if CLIENT_WEAPONS
flags = FEV_NOTHOST; flags = FEV_NOTHOST;
#else #else
flags = 0; flags = 0;

3
dlls/weapons.h
Unescape View File

@ -756,8 +756,7 @@ private:
class CShotgun : public CBasePlayerWeapon class CShotgun : public CBasePlayerWeapon
{ {
public: public:
#if !CLIENT_DLL
#ifndef 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[];

Write Preview
Loading…
Cancel
Save