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;
===============================================================================
*/
-void SleepUntilInput (int time);
-
void Sys_Error (const char *error, ...)
{
va_list argptr;
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)
{
if (!in_sys_error2)
{
in_sys_error2 = 1;
- DeinitConProc ();
+ Sys_Shutdown ();
}
exit (1);
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__
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;
if ((hClipboardData = GetClipboardData (CF_TEXT)) != 0)
{
- if ((cliptext = GlobalLock (hClipboardData)) != 0)
+ if ((cliptext = GlobalLock (hClipboardData)) != 0)
{
data = malloc (GlobalSize(hClipboardData)+1);
strcpy (data, cliptext);
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);
+
+ // 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);
+}
+
/*
==============================================================================
*/
-void SleepUntilInput (int time)
-{
- MsgWaitForMultipleObjects(1, &tevent, false, time, QS_ALLINPUT);
-}
-
-
/*
==================
WinMain
{
double frameoldtime, framenewtime;
MEMORYSTATUS lpBuffer;
- int t;
/* previous instances do not exist in Win32 */
if (hPrevInstance)
}
}
- 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;
projects / xonotic / darkplaces.git / blobdiff