diff options
| author | John Schoenick <[email protected]> | 2015-09-09 18:35:41 -0700 |
|---|---|---|
| committer | John Schoenick <[email protected]> | 2015-09-09 18:35:41 -0700 |
| commit | 0d8dceea4310fde5706b3ce1c70609d72a38efdf (patch) | |
| tree | c831ef32c2c801a5c5a80401736b52c7b5a528ec /mp/src/game/server/baseentity.h | |
| parent | Updated the SDK with the latest code from the TF and HL2 branches. (diff) | |
| download | source-sdk-2013-master.tar.xz source-sdk-2013-master.zip | |
Diffstat (limited to 'mp/src/game/server/baseentity.h')
| -rw-r--r-- | mp/src/game/server/baseentity.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/mp/src/game/server/baseentity.h b/mp/src/game/server/baseentity.h index 7261e0a8..42c0cdf2 100644 --- a/mp/src/game/server/baseentity.h +++ b/mp/src/game/server/baseentity.h @@ -904,7 +904,7 @@ public: virtual int OnTakeDamage( const CTakeDamageInfo &info ); // This is what you should call to apply damage to an entity. - void TakeDamage( const CTakeDamageInfo &info ); + int TakeDamage( const CTakeDamageInfo &info ); virtual void AdjustDamageDirection( const CTakeDamageInfo &info, Vector &dir, CBaseEntity *pEnt ) {} virtual int TakeHealth( float flHealth, int bitsDamageType ); @@ -1748,6 +1748,7 @@ private: // randon number generators to spit out the same random numbers on both sides for a particular // usercmd input. static int m_nPredictionRandomSeed; + static int m_nPredictionRandomSeedServer; static CBasePlayer *m_pPredictionPlayer; // FIXME: Make hierarchy a member of CBaseEntity @@ -1761,7 +1762,7 @@ private: public: // Accessors for above - static int GetPredictionRandomSeed( void ); + static int GetPredictionRandomSeed( bool bUseUnSyncedServerPlatTime = false ); static void SetPredictionRandomSeed( const CUserCmd *cmd ); static CBasePlayer *GetPredictionPlayer( void ); static void SetPredictionPlayer( CBasePlayer *player ); @@ -1799,6 +1800,8 @@ public: { return s_bAbsQueriesValid; } + + virtual bool ShouldBlockNav() const { return true; } }; // Send tables exposed in this module. |