valve/source-sdk-2013
0
0
Fork 0
mirror of https://github.com/ValveSoftware/source-sdk-2013.git synced 2025-02-17 09:31:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed not restoring pose parameters or checking if GetModelPtr is null

Browse source 
Shouldn't write code after staying up 24 hours
This commit is contained in:
AltimorTASDK 2015-08-18 04:24:59 -04:00
parent 6bccd264eb
commit 4b6932ac4a
1 changed files with 34 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
mp/src/game/server/player_lagcompensation.cpp
View file

@ -24,6 +24,7 @@
#define LC_ANGLES_CHANGED (1<<9) #define LC_ANGLES_CHANGED (1<<9)
#define LC_SIZE_CHANGED (1<<10) #define LC_SIZE_CHANGED (1<<10)
#define LC_ANIMATION_CHANGED (1<<11) #define LC_ANIMATION_CHANGED (1<<11)
#define LC_POSE_PARAMS_CHANGED (1<<12)
static ConVar sv_lagcompensation_teleport_dist( "sv_lagcompensation_teleport_dist", "64", FCVAR_DEVELOPMENTONLY | FCVAR_CHEAT, "How far a player got moved by game code before we can't lag compensate their position back" ); static ConVar sv_lagcompensation_teleport_dist( "sv_lagcompensation_teleport_dist", "64", FCVAR_DEVELOPMENTONLY | FCVAR_CHEAT, "How far a player got moved by game code before we can't lag compensate their position back" );
#define LAG_COMPENSATION_EPS_SQR ( 0.1f * 0.1f ) #define LAG_COMPENSATION_EPS_SQR ( 0.1f * 0.1f )
@ -322,9 +323,12 @@ void CLagCompensationManager::FrameUpdatePostEntityThink()
record.m_masterCycle = pPlayer->GetCycle(); record.m_masterCycle = pPlayer->GetCycle();
CStudioHdr *hdr = pPlayer->GetModelPtr(); CStudioHdr *hdr = pPlayer->GetModelPtr();
for( int paramIndex = 0; paramIndex < hdr->GetNumPoseParameters(); paramIndex++ ) if( hdr )
{ {
record.m_poseParameters[paramIndex] = pPlayer->GetPoseParameter( paramIndex ); for( int paramIndex = 0; paramIndex < hdr->GetNumPoseParameters(); paramIndex++ )
{
record.m_poseParameters[paramIndex] = pPlayer->GetPoseParameter( paramIndex );
}
} }
} }
@ -723,19 +727,22 @@ void CLagCompensationManager::BacktrackPlayer( CBasePlayer *pPlayer, float flTar
// Now do pose parameters // Now do pose parameters
CStudioHdr *hdr = pPlayer->GetModelPtr(); CStudioHdr *hdr = pPlayer->GetModelPtr();
for( int paramIndex = 0; paramIndex < hdr->GetNumPoseParameters(); paramIndex++ ) if( hdr )
{ {
float poseParameter = record->m_poseParameters[paramIndex]; for( int paramIndex = 0; paramIndex < hdr->GetNumPoseParameters(); paramIndex++ )
if( (frac > 0.0f) && interpolationAllowed )
{ {
// These could wrap like cycles, but there's no way to know. In the most common case float poseParameter = record->m_poseParameters[paramIndex];
// (move_x/move_y) it's correct to just lerp. Interpolation almost never happens anyways. if( (frac > 0.0f) && interpolationAllowed )
float prevPoseParameter = prevRecord->m_poseParameters[paramIndex]; {
pPlayer->SetPoseParameter( paramIndex, Lerp( frac, poseParameter, prevPoseParameter ) ); // These could wrap like cycles, but there's no way to know. In the most common case
} // (move_x/move_y) it's correct to just lerp. Interpolation almost never happens anyways.
else float prevPoseParameter = prevRecord->m_poseParameters[paramIndex];
{ pPlayer->SetPoseParameter( paramIndex, Lerp( frac, poseParameter, prevPoseParameter ) );
pPlayer->SetPoseParameter( paramIndex, poseParameter ); }
else
{
pPlayer->SetPoseParameter( paramIndex, poseParameter );
}
} }
} }
@ -860,6 +867,20 @@ void CLagCompensationManager::FinishLagCompensation( CBasePlayer *player )
} }
} }
} }
if( restore->m_fFlags & LC_POSE_PARAMS_CHANGED )
{
restoreSimulationTime = true;
CStudioHdr *hdr = pPlayer->GetModelPtr();
if( hdr )
{
for( int paramIndex = 0; paramIndex < hdr->GetNumPoseParameters(); paramIndex++ )
{
pPlayer->SetPoseParameter( paramIndex, restore->m_poseParameters[paramIndex] );
}
}
}
if ( restoreSimulationTime ) if ( restoreSimulationTime )
{ {