reHLDS/rehlds
2
0
Fork 0
mirror of https://github.com/rehlds/rehlds.git synced 2025-01-30 15:38:05 +03:00
Code Issues Projects Releases Wiki Activity

Fix crash in saving bone state for current frame

Browse Source
This commit is contained in:
Alibek Omarov 2018-06-12 12:29:33 +03:00
parent a4f4e34fae
commit 0799c568f0
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
rehlds/engine/sv_user.cpp
View File

@ -1012,12 +1012,12 @@ void SV_RunCmd(usercmd_t *ucmd, int random_seed)
gEntityInterface.pfnPlayerPostThink(sv_player); gEntityInterface.pfnPlayerPostThink(sv_player);
gEntityInterface.pfnCmdEnd(sv_player); gEntityInterface.pfnCmdEnd(sv_player);
if (!host_client->fakeclient)
SV_RestoreMove(host_client);
#ifdef REHLDS_FIXES #ifdef REHLDS_FIXES
SV_SaveBoneState( host_client, sv_player ); SV_SaveBoneState( host_client, sv_player );
#endif #endif
if (!host_client->fakeclient)
SV_RestoreMove(host_client);
} }
int SV_ValidateClientCommand(char *pszCommand) int SV_ValidateClientCommand(char *pszCommand)
@ -2037,6 +2037,22 @@ void SV_SaveBoneState(client_t *_host_client, const edict_t *edict)
// get last outgoing frame // get last outgoing frame
frame = &_host_client->frames[SV_UPDATE_MASK & (_host_client->netchan.outgoing_sequence)]; frame = &_host_client->frames[SV_UPDATE_MASK & (_host_client->netchan.outgoing_sequence)];
// not a studio model
if( g_psv.models[i]->type != mod_studio )
{
frame->bonestate.valid = false;
return;
}
studiohdr_t *hdr = (studiohdr_t*)Mod_Extradata(g_psv.models[edict->v.modelindex]);
// shouldn't really happen
if( !hdr )
{
frame->bonestate.valid = false;
return;
}
// set up bones // set up bones
g_pSvBlendingAPI->SV_StudioSetupBones( g_pSvBlendingAPI->SV_StudioSetupBones(
g_psv.models[edict->v.modelindex], g_psv.models[edict->v.modelindex],
@ -2046,7 +2062,7 @@ void SV_SaveBoneState(client_t *_host_client, const edict_t *edict)
// copy bones // copy bones
frame->bonestate.valid = true; frame->bonestate.valid = true;
frame->bonestate.numbones = pstudiohdr->numbones; frame->bonestate.numbones = hdr->numbones;
Q_memcpy( frame->bonestate.bonetransform, bonetransform, sizeof( bonetransform )); Q_memcpy( frame->bonestate.bonetransform, bonetransform, sizeof( bonetransform ));
Q_memcpy( frame->bonestate.rotationmatrix, rotationmatrix, sizeof( rotationmatrix )); Q_memcpy( frame->bonestate.rotationmatrix, rotationmatrix, sizeof( rotationmatrix ));