mirror of
https://git.code.sf.net/p/quake/quakeforge
synced 2025-01-31 05:00:35 +00:00
Back out Mercury's removal of emodel and pmodel. They are /required/ by some
servers.
This commit is contained in:
parent
380dcf5c9b
commit
a0796826ee
2 changed files with 16 additions and 0 deletions
|
@ -200,6 +200,8 @@ void Master_Connect_f (void);
|
|||
|
||||
char *server_version = NULL; // version of server we connected to
|
||||
|
||||
char emodel_name[] = "emodel";
|
||||
char pmodel_name[] = "pmodel";
|
||||
char prespawn_name[] = "prespawn %i 0 %i";
|
||||
char modellist_name[] = "modellist %i %i";
|
||||
char soundlist_name[] = "soundlist %i %i";
|
||||
|
@ -688,6 +690,9 @@ CL_FullInfo_f (void)
|
|||
if (*s)
|
||||
s++;
|
||||
|
||||
if (strcaseequal (key, pmodel_name) || strcaseequal (key, emodel_name))
|
||||
continue;
|
||||
|
||||
Info_SetValueForKey (cls.userinfo, key, value, MAX_INFO_STRING);
|
||||
}
|
||||
}
|
||||
|
@ -709,6 +714,10 @@ CL_SetInfo_f (void)
|
|||
Con_Printf ("usage: setinfo [ <key> <value> ]\n");
|
||||
return;
|
||||
}
|
||||
if (strcaseequal (Cmd_Argv (1), pmodel_name)
|
||||
|| strcaseequal (Cmd_Argv (1), emodel_name))
|
||||
return;
|
||||
|
||||
Info_SetValueForKey (cls.userinfo, Cmd_Argv (1), Cmd_Argv (2),
|
||||
MAX_INFO_STRING);
|
||||
if (cls.state >= ca_connected)
|
||||
|
|
|
@ -290,6 +290,13 @@ Model_NextDownload (void)
|
|||
return;
|
||||
}
|
||||
|
||||
if (strequal (cl.model_name[i], "progs/player.mdl")
|
||||
&& cl.model_precache[i]->type == mod_alias)
|
||||
info_key = pmodel_name;
|
||||
if (strequal (cl.model_name[i], "progs/eyes.mdl")
|
||||
&& cl.model_precache[i]->type == mod_alias)
|
||||
info_key = emodel_name;
|
||||
|
||||
if (info_key) {
|
||||
aliashdr_t *ahdr = (aliashdr_t *) Mod_Extradata (cl.model_precache[i]);
|
||||
Info_SetValueForKey (cls.userinfo, info_key, va ("%d", ahdr->crc),
|
||||
|
|
Loading…
Reference in a new issue