xutaxkamay/css_enhanced_waf
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Do not uses ragdolls when in lag context

Browse source
This commit is contained in:
unknown 2024-09-09 01:37:37 +02:00
parent 690d119fc6
commit 8f7d2f6843
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
game/client/cstrike/c_cs_player.cpp
View file

@ -766,6 +766,8 @@ C_CSPlayer::C_CSPlayer() :
ListenForGameEvent( "bullet_hit_player" ); ListenForGameEvent( "bullet_hit_player" );
ListenForGameEvent( "bullet_player_hitboxes" ); ListenForGameEvent( "bullet_player_hitboxes" );
ListenForGameEvent( "player_lag_hitboxes" ); ListenForGameEvent( "player_lag_hitboxes" );
m_bIsInsideLagCompensationContext = false;
} }
@ -2136,10 +2138,14 @@ void C_CSPlayer::FireGameEvent( IGameEvent* event )
const auto nAttackerTickBase = event->GetInt( "tickbase" ); const auto nAttackerTickBase = event->GetInt( "tickbase" );
const auto pStudioHdr = player->GetModelPtr(); const auto pStudioHdr = player->GetModelPtr();
const auto numhitboxes = event->GetInt( "num_hitboxes" ); const auto numhitboxes = event->GetInt( "num_hitboxes" );
const auto parent_index = event->GetInt( "parent_index", -1 );
QAngle angles[MAXSTUDIOBONES]; QAngle angles[MAXSTUDIOBONES];
Vector positions[MAXSTUDIOBONES]; Vector positions[MAXSTUDIOBONES];
player->m_bIsInsideLagCompensationContext = true;
player->PushEnableAbsRecomputations( true );
AssertFatal( numhitboxes == pStudioHdr->pHitboxSet( player->m_nHitboxSet )->numhitboxes ); AssertFatal( numhitboxes == pStudioHdr->pHitboxSet( player->m_nHitboxSet )->numhitboxes );
for ( int i = 0; i < numhitboxes; i++ ) for ( int i = 0; i < numhitboxes; i++ )
@ -2193,8 +2199,8 @@ void C_CSPlayer::FireGameEvent( IGameEvent* event )
player->SetSequence( event->GetInt( "sequence" ) ); player->SetSequence( event->GetInt( "sequence" ) );
player->SetCycle( event->GetFloat( "cycle" ) ); player->SetCycle( event->GetFloat( "cycle" ) );
player->SetAbsOrigin( Vector( event->GetFloat( "position_x" ), player->SetAbsOrigin( Vector( event->GetFloat( "position_x" ),
event->GetFloat( "position_y" ), event->GetFloat( "position_y" ),
event->GetFloat( "position_z" ) ) ); event->GetFloat( "position_z" ) ) );
player->m_angRenderAngles = QAngle( event->GetFloat( "angle_x" ), player->m_angRenderAngles = QAngle( event->GetFloat( "angle_x" ),
event->GetFloat( "angle_y" ), event->GetFloat( "angle_y" ),
@ -2418,14 +2424,12 @@ void C_CSPlayer::FireGameEvent( IGameEvent* event )
nAttackerTickBase ); nAttackerTickBase );
} }
player->PushEnableAbsRecomputations( true );
player->PushAllowBoneAccess( true, false, "Lag compensation context" ); player->PushAllowBoneAccess( true, false, "Lag compensation context" );
// Be sure we setup the bones again. // Be sure we setup the bones again.
player->InvalidateBoneCache(); player->InvalidateBoneCache();
player->SetupBones( NULL, -1, BONE_USED_BY_ANYTHING, gpGlobals->curtime ); player->SetupBones( NULL, -1, BONE_USED_BY_ANYTHING, gpGlobals->curtime );
player->DrawClientHitboxes( flDuration, false ); player->DrawClientHitboxes( flDuration, false );
player->PopBoneAccess( "Lag compensation context" ); player->PopBoneAccess( "Lag compensation context" );
player->PopEnableAbsRecomputations();
// Set back original stuff. // Set back original stuff.
player->SetSequence( iOldSequence ); player->SetSequence( iOldSequence );
@ -2452,6 +2456,8 @@ void C_CSPlayer::FireGameEvent( IGameEvent* event )
player->PushAllowBoneAccess( true, false, "Lag compensation context" ); player->PushAllowBoneAccess( true, false, "Lag compensation context" );
player->InvalidateBoneCache(); player->InvalidateBoneCache();
player->PopBoneAccess( "Lag compensation context" ); player->PopBoneAccess( "Lag compensation context" );
player->PopEnableAbsRecomputations();
player->m_bIsInsideLagCompensationContext = false;
} }
} }
}; };
@ -2507,7 +2513,7 @@ Activity C_CSPlayer::GetActivity() const
const Vector& C_CSPlayer::GetRenderOrigin( void ) const Vector& C_CSPlayer::GetRenderOrigin( void )
{ {
if ( m_hRagdoll.Get() ) if ( m_hRagdoll.Get() && !m_bIsInsideLagCompensationContext )
{ {
C_CSRagdoll *pRagdoll = (C_CSRagdoll*)m_hRagdoll.Get(); C_CSRagdoll *pRagdoll = (C_CSRagdoll*)m_hRagdoll.Get();
if ( pRagdoll->IsInitialized() ) if ( pRagdoll->IsInitialized() )

1
game/client/cstrike/c_cs_player.h
View file

@ -427,6 +427,7 @@ private:
CUtlCircularBuffer< HitboxRecord, MAX_HISTORY_HITBOX_RECORDS > m_HitboxTrack[MAX_PLAYERS + 1]; CUtlCircularBuffer< HitboxRecord, MAX_HISTORY_HITBOX_RECORDS > m_HitboxTrack[MAX_PLAYERS + 1];
QAngle m_angRenderAngles; QAngle m_angRenderAngles;
bool m_bIsInsideLagCompensationContext;
}; };
C_CSPlayer* GetLocalOrInEyeCSPlayer( void ); C_CSPlayer* GetLocalOrInEyeCSPlayer( void );