Fix vwep injection for demos. (#269)

This commit is contained in:
Daniel Svensson 2024-08-30 21:04:56 +02:00 committed by GitHub
parent 52e672d034
commit 72fe01555a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 13 additions and 13 deletions

View File

@ -5028,16 +5028,16 @@ void CLQW_ParsePlayerinfo (void)
static struct { static struct {
const char *vmdl; const char *vmdl;
const char *vwep; const char *vwep;
} haxx[] = } vwep_mapping[] =
{ {
{"progs/v_axe.mdl", "w_axe"}, {"progs/v_axe.mdl", "progs/w_axe.mdl"},
{"progs/v_shot.mdl", "w_shot"}, {"progs/v_shot.mdl", "progs/w_shot.mdl"},
{"progs/v_shot2.mdl", "w_shot2"}, {"progs/v_shot2.mdl", "progs/w_shot2.mdl"},
{"progs/v_nail.mdl", "w_nail"}, {"progs/v_nail.mdl", "progs/w_nail.mdl"},
{"progs/v_nail2.mdl", "w_nail2"}, {"progs/v_nail2.mdl", "progs/w_nail2.mdl"},
{"progs/v_rock.mdl", "w_rock"}, {"progs/v_rock.mdl", "progs/w_rock.mdl"},
{"progs/v_rock2.mdl", "w_rock2"}, {"progs/v_rock2.mdl", "progs/w_rock2.mdl"},
{"progs/v_light.mdl", "w_light"}, {"progs/v_light.mdl", "progs/w_light.mdl"},
}; };
#endif #endif
player_state_t dummy; player_state_t dummy;
@ -5074,11 +5074,11 @@ void CLQW_ParsePlayerinfo (void)
viewmodel = cl.model_name[i]; viewmodel = cl.model_name[i];
if(viewmodel) 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++) for (i = 1; i < countof(cl.model_name_vwep); i++)
{ {
if (!cl.model_name_vwep[i]) if (!cl.model_name_vwep[i])

View File

@ -4699,7 +4699,7 @@ static void CL_ParseModellist (qboolean lots)
#ifdef QUAKESTATS #ifdef QUAKESTATS
if (cls.demoplayback == DPB_MVD && !cl.model_name_vwep[0] && !(cls.fteprotocolextensions2&PEXT2_REPLACEMENTDELTAS)) 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 #endif
SCR_SetLoadingFile("loading data"); SCR_SetLoadingFile("loading data");