From 72fe01555ab721d3b4863acb90dcf7dae66192f4 Mon Sep 17 00:00:00 2001
From: Daniel Svensson <dsvensson@gmail.com>
Date: Fri, 30 Aug 2024 21:04:56 +0200
Subject: [PATCH] Fix vwep injection for demos. (#269)

---
 engine/client/cl_ents.c  | 24 ++++++++++++------------
 engine/client/cl_parse.c |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/engine/client/cl_ents.c b/engine/client/cl_ents.c
index ccecc1e4c..90f11eba7 100644
--- a/engine/client/cl_ents.c
+++ b/engine/client/cl_ents.c
@@ -5028,16 +5028,16 @@ void CLQW_ParsePlayerinfo (void)
 		static struct {
 			const char *vmdl;
 			const char *vwep;
-		} haxx[] =
+		} vwep_mapping[] =
 		{
-			{"progs/v_axe.mdl",		"w_axe"},
-			{"progs/v_shot.mdl",	"w_shot"},
-			{"progs/v_shot2.mdl",	"w_shot2"},
-			{"progs/v_nail.mdl",	"w_nail"},
-			{"progs/v_nail2.mdl",	"w_nail2"},
-			{"progs/v_rock.mdl",	"w_rock"},
-			{"progs/v_rock2.mdl",	"w_rock2"},
-			{"progs/v_light.mdl",	"w_light"},
+			{"progs/v_axe.mdl",	"progs/w_axe.mdl"},
+			{"progs/v_shot.mdl",	"progs/w_shot.mdl"},
+			{"progs/v_shot2.mdl",	"progs/w_shot2.mdl"},
+			{"progs/v_nail.mdl",	"progs/w_nail.mdl"},
+			{"progs/v_nail2.mdl",	"progs/w_nail2.mdl"},
+			{"progs/v_rock.mdl",	"progs/w_rock.mdl"},
+			{"progs/v_rock2.mdl",	"progs/w_rock2.mdl"},
+			{"progs/v_light.mdl",	"progs/w_light.mdl"},
 		};
 #endif
 		player_state_t	dummy;
@@ -5074,11 +5074,11 @@ void CLQW_ParsePlayerinfo (void)
 			viewmodel = cl.model_name[i];
 		if(viewmodel)
 		{
-			for (i = 0; i < countof(haxx); i++)
+			for (i = 0; i < countof(vwep_mapping); i++)
 			{
-				if (!strcmp(viewmodel, haxx[i].vmdl))
+				if (!strcmp(viewmodel, vwep_mapping[i].vmdl))
 				{
-					viewmodel = haxx[i].vwep;
+					viewmodel = vwep_mapping[i].vwep;
 					for (i = 1; i < countof(cl.model_name_vwep); i++)
 					{
 						if (!cl.model_name_vwep[i])
diff --git a/engine/client/cl_parse.c b/engine/client/cl_parse.c
index 3b526c577..d03783047 100644
--- a/engine/client/cl_parse.c
+++ b/engine/client/cl_parse.c
@@ -4699,7 +4699,7 @@ static void CL_ParseModellist (qboolean lots)
 
 #ifdef QUAKESTATS
 	if (cls.demoplayback == DPB_MVD && !cl.model_name_vwep[0] && !(cls.fteprotocolextensions2&PEXT2_REPLACEMENTDELTAS))
-		CL_ParseStuffCmd("//vwep vwplayer w_axe w_shot w_shot2 w_nail w_nail2 w_rock w_rock2 w_light", 0);
+		CL_ParseStuffCmd("//vwep vwplayer w_axe w_shot w_shot2 w_nail w_nail2 w_rock w_rock2 w_light\n", 0);
 #endif
 
 	SCR_SetLoadingFile("loading data");