From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Sun, 8 Jun 2003 05:43:44 +0000 (+0000)
Subject: cleaned up Host_Error a bit
X-Git-Tag: xonotic-v0.1.0preview~6592
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a68ee07c9e3faede6dd807dea1ab72d0514abefa;p=xonotic%2Fdarkplaces.git

cleaned up Host_Error a bit


git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@3072 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/host.c b/host.c
index c5c783b5..93b55015 100644
--- a/host.c
+++ b/host.c
@@ -132,43 +132,35 @@ Host_Error
 This shuts down both the client and server
 ================
 */
-char hosterrorstring[4096];
+static char hosterrorstring1[4096];
+static char hosterrorstring2[4096];
+static qboolean hosterror = false;
 extern char sv_spawnmap[MAX_QPATH];
 extern char sv_loadgame[MAX_OSPATH];
 void Host_Error (const char *error, ...)
 {
 	va_list argptr;
-	static qboolean inerror = false;
 
-	// make sure we don't get in a loading loop
-	sv_loadgame[0] = 0;
-	sv_spawnmap[0] = 0;
+	va_start (argptr,error);
+	vsprintf (hosterrorstring1,error,argptr);
+	va_end (argptr);
+
+	Con_Printf ("Host_Error: %s\n", hosterrorstring1);
 
 	// LordHavoc: if first frame has not been shown, or currently shutting
 	// down, do Sys_Error instead
 	if (!host_loopactive || host_shuttingdown)
-	{
-		char string[4096];
-		va_start (argptr,error);
-		vsprintf (string,error,argptr);
-		va_end (argptr);
-		Sys_Error ("%s", string);
-	}
+		Sys_Error ("Host_Error: %s", hosterrorstring1);
 
-	if (inerror)
-	{
-		char string[4096];
-		va_start (argptr,error);
-		vsprintf (string,error,argptr);
-		va_end (argptr);
-		Sys_Error ("Host_Error: recursively entered (original error was: %s    new error is: %s)", hosterrorstring, string);
-	}
-	inerror = true;
+	if (hosterror)
+		Sys_Error ("Host_Error: recursively entered (original error was: %s    new error is: %s)", hosterrorstring2, hosterrorstring1);
+	hosterror = true;
 
-	va_start (argptr,error);
-	vsprintf (hosterrorstring,error,argptr);
-	va_end (argptr);
-	Con_Printf ("Host_Error: %s\n",hosterrorstring);
+	strcpy(hosterrorstring2, hosterrorstring1);
+
+	// make sure we don't get in a loading loop
+	sv_loadgame[0] = 0;
+	sv_spawnmap[0] = 0;
 
 	CL_Parse_DumpPacket();
 
@@ -178,7 +170,7 @@ void Host_Error (const char *error, ...)
 		Host_ShutdownServer (false);
 
 	if (cls.state == ca_dedicated)
-		Sys_Error ("Host_Error: %s\n",hosterrorstring);	// dedicated servers exit
+		Sys_Error ("Host_Error: %s\n",hosterrorstring2);	// dedicated servers exit
 
 	CL_Disconnect ();
 	cls.demonum = -1;
@@ -186,7 +178,7 @@ void Host_Error (const char *error, ...)
 	// unload any partially loaded models
 	Mod_ClearErrorModels();
 
-	inerror = false;
+	hosterror = false;
 
 	longjmp (host_abortserver, 1);
 }