qf/newtree
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/newtree synced 2025-02-23 03:40:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Recover gracefully from TF server cycling problem that sometimes doesn't

Browse source 
send the new map name, resulting in a crash. We now disconnect and go back
to console.
This commit is contained in:
Jeff Teunissen 2001-01-06 08:03:14 +00:00
parent 61cfc6a5db
commit f0d150104e
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
source/cl_parse.c
View file

@ -268,8 +268,7 @@ Model_NextDownload (void)
} }
cls.downloadtype = dl_model; cls.downloadtype = dl_model;
for (; cl.model_name[cls.downloadnumber][0]; for (; cl.model_name[cls.downloadnumber][0]; cls.downloadnumber++) {
cls.downloadnumber++) {
s = cl.model_name[cls.downloadnumber]; s = cl.model_name[cls.downloadnumber];
if (s[0] == '*') if (s[0] == '*')
continue; // inline brush model continue; // inline brush model
@ -284,9 +283,7 @@ Model_NextDownload (void)
cl.model_precache[i] = Mod_ForName (cl.model_name[i], false); cl.model_precache[i] = Mod_ForName (cl.model_name[i], false);
if (!cl.model_precache[i]) { if (!cl.model_precache[i]) {
Con_Printf Con_Printf ("\nThe required model file '%s' could not be found or downloaded.\n\n", cl.model_name[i]);
("\nThe required model file '%s' could not be found or downloaded.\n\n",
cl.model_name[i]);
Con_Printf ("You may need to download or purchase a %s client " Con_Printf ("You may need to download or purchase a %s client "
"pack in order to play on this server.\n\n", "pack in order to play on this server.\n\n",
gamedirfile); gamedirfile);
@ -295,6 +292,15 @@ Model_NextDownload (void)
} }
} }
// Something went wrong (probably in the server, probably a TF server)
// We need to disconnect gracefully.
if (!cl.model_precache[1]) {
Con_Printf ("\nThe server has failed to provide the map name.\n\n");
Con_Printf ("Disconnecting to prevent a crash.\n\n");
CL_Disconnect ();
return;
}
// all done // all done
cl.worldmodel = cl.model_precache[1]; cl.worldmodel = cl.model_precache[1];
R_NewMap (); R_NewMap ();