RomkaZVO/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/FWGS/xash3d-fwgs.git synced 2026-08-05 03:24:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

engine: client: always pass a valid pointer to usercmd_t in ref_params_t to prevent crassh when client.dll reads them during demo playback

Browse Source
This commit is contained in:
Alibek Omarov
2025-05-05 03:40:18 +03:00
parent 47c4844024
commit 3d26ba1ed8
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
engine/client/cl_demo.c
View File

@@ -642,9 +642,7 @@ static void CL_ReadDemoUserCmd( qboolean discard )
pcmd->sendsize = 1; pcmd->sendsize = 1;
// always delta'ing from null // always delta'ing from null
cl.cmd = &pcmd->cmd; MSG_ReadDeltaUsercmd( &buf, &nullcmd, &pcmd->cmd );
MSG_ReadDeltaUsercmd( &buf, &nullcmd, cl.cmd );
// make sure what interp info contain angles from different frames // make sure what interp info contain angles from different frames
// or lerping will stop working // or lerping will stop working
@@ -656,13 +654,16 @@ static void CL_ReadDemoUserCmd( qboolean discard )
// record update // record update
a->starttime = demo.timestamp; a->starttime = demo.timestamp;
VectorCopy( cl.cmd->viewangles, a->viewangles ); VectorCopy( pcmd->cmd.viewangles, a->viewangles );
demo.lasttime = demo.timestamp; demo.lasttime = demo.timestamp;
} }
// NOTE: we need to have the current outgoing sequence correct // NOTE: we need to have the current outgoing sequence correct
// so we can do prediction correctly during playback // so we can do prediction correctly during playback
cls.netchan.outgoing_sequence = outgoing_sequence; cls.netchan.outgoing_sequence = outgoing_sequence;
// save last usercmd
cl.cmd = pcmd->cmd;
} }
} }
@@ -1145,8 +1146,7 @@ void CL_DemoInterpolateAngles( void )
QuaternionSlerp( q2, q1, frac, q ); QuaternionSlerp( q2, q1, frac, q );
QuaternionAngle( q, cl.viewangles ); QuaternionAngle( q, cl.viewangles );
} }
else if( cl.cmd != NULL ) else VectorCopy( cl.cmd.viewangles, cl.viewangles );
VectorCopy( cl.cmd->viewangles, cl.viewangles );
} }
/* /*

2
engine/client/cl_main.c
View File

@@ -673,7 +673,7 @@ static void CL_CreateCmd( void )
} }
// demo always have commands so don't overwrite them // demo always have commands so don't overwrite them
if( !cls.demoplayback ) cl.cmd = &pcmd->cmd; if( !cls.demoplayback ) cl.cmd = pcmd->cmd;
// predict all unacknowledged movements // predict all unacknowledged movements
CL_PredictMovement( false ); CL_PredictMovement( false );

2
engine/client/cl_pmove.c
View File

@@ -973,7 +973,7 @@ void CL_MoveSpectatorCamera( void )
CL_SetUpPlayerPrediction( false, true ); CL_SetUpPlayerPrediction( false, true );
CL_SetSolidPlayers( cl.playernum ); CL_SetSolidPlayers( cl.playernum );
CL_RunUsercmd( &cls.spectator_state, &cls.spectator_state, cl.cmd, true, &time, (uint)( time * 100.0 )); CL_RunUsercmd( &cls.spectator_state, &cls.spectator_state, &cl.cmd, true, &time, (uint)( time * 100.0 ));
VectorCopy( cls.spectator_state.client.velocity, cl.simvel ); VectorCopy( cls.spectator_state.client.velocity, cl.simvel );
VectorCopy( cls.spectator_state.client.origin, cl.simorg ); VectorCopy( cls.spectator_state.client.origin, cl.simorg );

2
engine/client/cl_view.c
View File

@@ -165,7 +165,7 @@ static void V_SetRefParams( ref_params_t *fd )
// get pointers to movement vars and user cmd // get pointers to movement vars and user cmd
fd->movevars = &clgame.movevars; fd->movevars = &clgame.movevars;
fd->cmd = cl.cmd; fd->cmd = &cl.cmd;
// setup viewport // setup viewport
fd->viewport[0] = clgame.viewport[0]; fd->viewport[0] = clgame.viewport[0];

2
engine/client/client.h
View File

@@ -234,7 +234,7 @@ typedef struct
cl_local_data_t local; cl_local_data_t local;
// player final info // player final info
usercmd_t *cmd; // cl.commands[outgoing_sequence].cmd usercmd_t cmd; // cl.commands[outgoing_sequence].cmd
vec3_t viewangles; vec3_t viewangles;
vec3_t viewheight; vec3_t viewheight;
vec3_t punchangle; vec3_t punchangle;