X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=sys_win.c;h=4fa62ee06cc5e4c6186ffc1fdab6fb02019e6452;hb=05b6edf1a4dac900a2d587ce8f26077642ba1792;hp=8dd8299838890579dca1ba5d13e0f2fc99053def;hpb=338b8c8025e3b1adf804820131d6e27d0cf06bb9;p=xonotic%2Fdarkplaces.git

diff --git a/sys_win.c b/sys_win.c
index 8dd82998..4fa62ee0 100644
--- a/sys_win.c
+++ b/sys_win.c
@@ -31,14 +31,6 @@ extern void S_BlockSound (void);
 
 cvar_t sys_usetimegettime = {CVAR_SAVE, "sys_usetimegettime", "1"};
 
-// # of seconds to wait on Sys_Error running dedicated before exiting
-#define CONSOLE_ERROR_TIMEOUT	60.0
-// sleep time on pause or minimization
-#define PAUSE_SLEEP		50
-// sleep time when not focus
-#define NOT_FOCUS_SLEEP	20
-
-static qboolean		sc_return_on_enter = false;
 HANDLE				hinput, houtput;
 
 static HANDLE	tevent;
@@ -55,8 +47,6 @@ SYSTEM IO
 ===============================================================================
 */
 
-void SleepUntilInput (int time);
-
 void Sys_Error (const char *error, ...)
 {
 	va_list		argptr;
@@ -64,22 +54,26 @@ void Sys_Error (const char *error, ...)
 	static int	in_sys_error0 = 0;
 	static int	in_sys_error1 = 0;
 	static int	in_sys_error2 = 0;
+	static int	in_sys_error3 = 0;
 
 	va_start (argptr, error);
-	vsnprintf (text, sizeof (text), error, argptr);
+	dpvsnprintf (text, sizeof (text), error, argptr);
 	va_end (argptr);
 
+	Con_Printf ("Quake Error: %s\n", text);
+
 	// close video so the message box is visible, unless we already tried that
 	if (!in_sys_error0 && cls.state != ca_dedicated)
 	{
 		in_sys_error0 = 1;
-		VID_Shutdown();     
+		VID_Shutdown();
 	}
-	MessageBox(NULL, text, "Quake Error", MB_OK | MB_SETFOREGROUND | MB_ICONSTOP);
 
-	Con_Print ("Quake Error: ");
-	Con_Print (text);
-	Con_Print ("\n");
+	if (!in_sys_error3 && cls.state != ca_dedicated)
+	{
+		in_sys_error3 = true;
+		MessageBox(NULL, text, "Quake Error", MB_OK | MB_SETFOREGROUND | MB_ICONSTOP);
+	}
 
 	if (!in_sys_error1)
 	{
@@ -91,7 +85,7 @@ void Sys_Error (const char *error, ...)
 	if (!in_sys_error2)
 	{
 		in_sys_error2 = 1;
-		DeinitConProc ();
+		Sys_Shutdown ();
 	}
 
 	exit (1);
@@ -238,13 +232,6 @@ char *Sys_ConsoleInput (void)
 							len = 0;
 							return text;
 						}
-						else if (sc_return_on_enter)
-						{
-						// special case to allow exiting from the error handler on Enter
-							text[0] = '\r';
-							len = 0;
-							return text;
-						}
 
 						break;
 
@@ -313,12 +300,6 @@ WINDOWS CRAP
 */
 
 
-void SleepUntilInput (int time)
-{
-	MsgWaitForMultipleObjects(1, &tevent, false, time, QS_ALLINPUT);
-}
-
-
 /*
 ==================
 WinMain
@@ -356,31 +337,31 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin
 		while (*lpCmdLine && *lpCmdLine <= ' ')
 			lpCmdLine++;
 
-		if (*lpCmdLine)
+		if (!*lpCmdLine)
+			break;
+
+		if (*lpCmdLine == '\"')
 		{
-			if (*lpCmdLine == '\"')
-			{
-				// quoted string
+			// quoted string
+			lpCmdLine++;
+			argv[com_argc] = lpCmdLine;
+			com_argc++;
+			while (*lpCmdLine && (*lpCmdLine != '\"'))
 				lpCmdLine++;
-				argv[com_argc] = lpCmdLine;
-				com_argc++;
-				while (*lpCmdLine && (*lpCmdLine != '\"'))
-					lpCmdLine++;
-			}
-			else
-			{
-				// unquoted word
-				argv[com_argc] = lpCmdLine;
-				com_argc++;
-				while (*lpCmdLine && *lpCmdLine > ' ')
-					lpCmdLine++;
-			}
-
-			if (*lpCmdLine)
-			{
-				*lpCmdLine = 0;
+		}
+		else
+		{
+			// unquoted word
+			argv[com_argc] = lpCmdLine;
+			com_argc++;
+			while (*lpCmdLine && *lpCmdLine > ' ')
 				lpCmdLine++;
-			}
+		}
+
+		if (*lpCmdLine)
+		{
+			*lpCmdLine = 0;
+			lpCmdLine++;
 		}
 	}
 
@@ -437,18 +418,6 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin
 	/* main window message loop */
 	while (1)
 	{
-		if (cls.state != ca_dedicated)
-		{
-		// yield the CPU for a little while when paused, minimized, or not the focus
-			if ((cl.paused && !vid_activewindow) || vid_hidden)
-			{
-				SleepUntilInput (PAUSE_SLEEP);
-				scr_skipupdate = 1;		// no point in bothering to draw
-			}
-			else if (!vid_activewindow)
-				SleepUntilInput (NOT_FOCUS_SLEEP);
-		}
-
 		framenewtime = Sys_DoubleTime ();
 		Host_Frame (framenewtime - frameoldtime);
 		frameoldtime = framenewtime;