From 52061621ac71079bdf88cb90c7f057fb3b040ee4 Mon Sep 17 00:00:00 2001
From: Alibek Omarov <a1ba.omarov@gmail.com>
Date: Tue, 27 Dec 2022 23:10:11 +0300
Subject: [PATCH] engine: client: do not let client.dll overwrite usercmd
 that's was read from demo

---
 engine/client/cl_main.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/engine/client/cl_main.c b/engine/client/cl_main.c
index f0463be5..06980afd 100644
--- a/engine/client/cl_main.c
+++ b/engine/client/cl_main.c
@@ -622,7 +622,7 @@ CL_CreateCmd
 */
 void CL_CreateCmd( void )
 {
-	usercmd_t		cmd;
+	usercmd_t	nullcmd, *cmd;
 	runcmd_t		*pcmd;
 	vec3_t		angles;
 	qboolean		active;
@@ -635,7 +635,6 @@ void CL_CreateCmd( void )
 	// store viewangles in case it's will be freeze
 	VectorCopy( cl.viewangles, angles );
 	ms = bound( 1, host.frametime * 1000, 255 );
-	memset( &cmd, 0, sizeof( cmd ));
 	input_override = 0;
 
 	CL_SetSolidEntities();
@@ -654,12 +653,18 @@ void CL_CreateCmd( void )
 		pcmd->receivedtime = -1.0;
 		pcmd->heldback = false;
 		pcmd->sendsize = 0;
+		cmd = &pcmd->cmd;
+	}
+	else
+	{
+		memset( &nullcmd, 0, sizeof( nullcmd ));
+		cmd = &nullcmd;
 	}
 
 	active = (( cls.signon == SIGNONS ) && !cl.paused && !cls.demoplayback );
 	Platform_PreCreateMove();
-	clgame.dllFuncs.CL_CreateMove( host.frametime, &pcmd->cmd, active );
-	IN_EngineAppendMove( host.frametime, &pcmd->cmd, active  );
+	clgame.dllFuncs.CL_CreateMove( host.frametime, cmd, active );
+	IN_EngineAppendMove( host.frametime, cmd, active  );
 
 	CL_PopPMStates();