X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=sys_win.c;h=c0ae22af3006c3230409385a0cc0dbb763e418b1;hp=c2892da98a24ef55e0994f3197728190ac781840;hb=52833855527530cf136cebeabbe55e268de17c0d;hpb=9c0b9e9bf48754ac5984a5eb5682fc869bb98277

diff --git a/sys_win.c b/sys_win.c
index c2892da9..c0ae22af 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;
@@ -67,7 +57,7 @@ void Sys_Error (const char *error, ...)
 	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);
@@ -118,7 +108,7 @@ void Sys_PrintToTerminal(const char *text)
 	DWORD dummy;
 	extern HANDLE houtput;
 	if (cls.state == ca_dedicated)
-		WriteFile(houtput, text, strlen (text), &dummy, NULL);
+		WriteFile(houtput, text, (DWORD) strlen(text), &dummy, NULL);
 }
 
 /*
@@ -167,7 +157,12 @@ double Sys_DoubleTime (void)
 		LARGE_INTEGER PerformanceCount;
 
 		if (!QueryPerformanceFrequency (&PerformanceFreq))
-			Sys_Error ("No hardware timer available");
+		{
+			Con_Printf ("No hardware timer available");
+			// fall back to timeGetTime
+			Cvar_SetValueQuick(&sys_usetimegettime, true);
+			return Sys_DoubleTime();
+		}
 		QueryPerformanceCounter (&PerformanceCount);
 
 		#ifdef __BORLANDC__
@@ -242,13 +237,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;
 
@@ -296,7 +284,7 @@ char *Sys_GetClipboardData (void)
 
 		if ((hClipboardData = GetClipboardData (CF_TEXT)) != 0)
 		{
-			if ((cliptext = GlobalLock (hClipboardData)) != 0) 
+			if ((cliptext = GlobalLock (hClipboardData)) != 0)
 			{
 				data = malloc (GlobalSize(hClipboardData)+1);
 				strcpy (data, cliptext);
@@ -308,6 +296,60 @@ char *Sys_GetClipboardData (void)
 	return data;
 }
 
+void Sys_InitConsole (void)
+{
+	int t;
+
+	// initialize the windows dedicated server console if needed
+	tevent = CreateEvent(NULL, false, false, NULL);
+
+	if (!tevent)
+		Sys_Error ("Couldn't create event");
+
+	// LordHavoc: can't check cls.state because it hasn't been initialized yet
+	// if (cls.state == ca_dedicated)
+	if (COM_CheckParm("-dedicated"))
+	{
+		if (!AllocConsole ())
+			Sys_Error ("Couldn't create dedicated server console");
+
+		hinput = GetStdHandle (STD_INPUT_HANDLE);
+		houtput = GetStdHandle (STD_OUTPUT_HANDLE);
+
+#ifdef WIN64
+#define atoi _atoi64
+#endif
+	// give QHOST a chance to hook into the console
+		if ((t = COM_CheckParm ("-HFILE")) > 0)
+		{
+			if (t < com_argc)
+				hFile = (HANDLE)atoi (com_argv[t+1]);
+		}
+
+		if ((t = COM_CheckParm ("-HPARENT")) > 0)
+		{
+			if (t < com_argc)
+				heventParent = (HANDLE)atoi (com_argv[t+1]);
+		}
+
+		if ((t = COM_CheckParm ("-HCHILD")) > 0)
+		{
+			if (t < com_argc)
+				heventChild = (HANDLE)atoi (com_argv[t+1]);
+		}
+
+		InitConProc (hFile, heventParent, heventChild);
+	}
+
+// because sound is off until we become active
+	S_BlockSound ();
+}
+
+void Sys_Init_Commands (void)
+{
+	Cvar_RegisterVariable(&sys_usetimegettime);
+}
+
 /*
 ==============================================================================
 
@@ -317,12 +359,6 @@ WINDOWS CRAP
 */
 
 
-void SleepUntilInput (int time)
-{
-	MsgWaitForMultipleObjects(1, &tevent, false, time, QS_ALLINPUT);
-}
-
-
 /*
 ==================
 WinMain
@@ -336,7 +372,6 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin
 {
 	double frameoldtime, framenewtime;
 	MEMORYSTATUS lpBuffer;
-	int t;
 
 	/* previous instances do not exist in Win32 */
 	if (hPrevInstance)
@@ -388,71 +423,13 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin
 		}
 	}
 
-	Sys_Shared_EarlyInit();
-
-	Cvar_RegisterVariable(&sys_usetimegettime);
-
-	tevent = CreateEvent(NULL, false, false, NULL);
-
-	if (!tevent)
-		Sys_Error ("Couldn't create event");
-
-	// LordHavoc: can't check cls.state because it hasn't been initialized yet
-	// if (cls.state == ca_dedicated)
-	if (COM_CheckParm("-dedicated"))
-	{
-		if (!AllocConsole ())
-			Sys_Error ("Couldn't create dedicated server console");
-
-		hinput = GetStdHandle (STD_INPUT_HANDLE);
-		houtput = GetStdHandle (STD_OUTPUT_HANDLE);
-
-	// give QHOST a chance to hook into the console
-		if ((t = COM_CheckParm ("-HFILE")) > 0)
-		{
-			if (t < com_argc)
-				hFile = (HANDLE)atoi (com_argv[t+1]);
-		}
-
-		if ((t = COM_CheckParm ("-HPARENT")) > 0)
-		{
-			if (t < com_argc)
-				heventParent = (HANDLE)atoi (com_argv[t+1]);
-		}
-
-		if ((t = COM_CheckParm ("-HCHILD")) > 0)
-		{
-			if (t < com_argc)
-				heventChild = (HANDLE)atoi (com_argv[t+1]);
-		}
-
-		InitConProc (hFile, heventParent, heventChild);
-	}
-
-// because sound is off until we become active
-	S_BlockSound ();
-
 	Host_Init ();
 
-	Sys_Shared_LateInit();
-
 	frameoldtime = Sys_DoubleTime ();
-	
+
 	/* 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;