From 0d8dceea4310fde5706b3ce1c70609d72a38efdf Mon Sep 17 00:00:00 2001 From: John Schoenick Date: Wed, 9 Sep 2015 18:35:41 -0700 Subject: Updated the SDK with the latest code from the TF and HL2 branches. --- mp/src/game/shared/baseentity_shared.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'mp/src/game/shared/baseentity_shared.cpp') diff --git a/mp/src/game/shared/baseentity_shared.cpp b/mp/src/game/shared/baseentity_shared.cpp index a843543f..376cd34e 100644 --- a/mp/src/game/shared/baseentity_shared.cpp +++ b/mp/src/game/shared/baseentity_shared.cpp @@ -636,10 +636,17 @@ void CBaseEntity::SetPredictionRandomSeed( const CUserCmd *cmd ) if ( !cmd ) { m_nPredictionRandomSeed = -1; +#ifdef GAME_DLL + m_nPredictionRandomSeedServer = -1; +#endif + return; } m_nPredictionRandomSeed = ( cmd->random_seed ); +#ifdef GAME_DLL + m_nPredictionRandomSeedServer = ( cmd->server_random_seed ); +#endif } @@ -1679,7 +1686,7 @@ void CBaseEntity::FireBullets( const FireBulletsInfo_t &info ) int iSeed = 0; if ( IsPlayer() ) { - iSeed = CBaseEntity::GetPredictionRandomSeed() & 255; + iSeed = CBaseEntity::GetPredictionRandomSeed( info.m_bUseServerRandomSeed ) & 255; } #if defined( HL2MP ) && defined( GAME_DLL ) -- cgit v1.2.3