huge (16%) speed gain on surface rendering by eliminating the surfmesh chain in q1bsp...

[xonotic/darkplaces.git] / sys_win.c

diff --git a/sys_win.c b/sys_win.c
index 5bd55f902cf5babb09e16b5d8c93caa14ade9318..d9b013b0bd8471ac2c9d6e882776ae4010c48cbf 100644 (file)
--- a/sys_win.c
+++ b/sys_win.c
@@ -35,8 +35,6 @@ cvar_t sys_usetimegettime = {CVAR_SAVE, "sys_usetimegettime", "1"};
 // sleep time when not focus
 #define NOT_FOCUS_SLEEP        20
 
-int                    starttime;
-
 static qboolean                sc_return_on_enter = false;
 HANDLE                         hinput, houtput;
 
@@ -45,6 +43,7 @@ static HANDLE hFile;
 static HANDLE  heventParent;
 static HANDLE  heventChild;
 
+
 /*
 ===============================================================================
 
@@ -58,57 +57,22 @@ void SleepUntilInput (int time);
 void Sys_Error (const char *error, ...)
 {
        va_list         argptr;
-       char            text[1024], text2[1024];
-       char            *text3 = "Press Enter to exit\n";
-       char            *text4 = "***********************************\n";
-       char            *text5 = "\n";
-       DWORD           dummy;
-       double          starttime;
+       char            text[1024];
        static int      in_sys_error0 = 0;
        static int      in_sys_error1 = 0;
        static int      in_sys_error2 = 0;
-       static int      in_sys_error3 = 0;
-
-       if (!in_sys_error3)
-               in_sys_error3 = 1;
 
        va_start (argptr, error);
        vsprintf (text, error, argptr);
        va_end (argptr);
 
-       if (cls.state == ca_dedicated)
-       {
-               va_start (argptr, error);
-               vsprintf (text, error, argptr);
-               va_end (argptr);
-
-               sprintf (text2, "ERROR: %s\n", text);
-               WriteFile (houtput, text5, strlen (text5), &dummy, NULL);
-               WriteFile (houtput, text4, strlen (text4), &dummy, NULL);
-               WriteFile (houtput, text2, strlen (text2), &dummy, NULL);
-               WriteFile (houtput, text3, strlen (text3), &dummy, NULL);
-               WriteFile (houtput, text4, strlen (text4), &dummy, NULL);
-
-
-               starttime = Sys_DoubleTime ();
-               sc_return_on_enter = true;      // so Enter will get us out of here
-
-               while (!Sys_ConsoleInput () && ((Sys_DoubleTime () - starttime) < CONSOLE_ERROR_TIMEOUT))
-                       SleepUntilInput(1);
-       }
-       else
+       // close video so the message box is visible, unless we already tried that
+       if (!in_sys_error0 && cls.state != ca_dedicated)
        {
-       // switch to windowed so the message box is visible, unless we already
-       // tried that and failed
-               if (!in_sys_error0)
-               {
-                       in_sys_error0 = 1;
-                       VID_SetDefaultMode ();
-                       MessageBox(NULL, text, "Quake Error", MB_OK | MB_SETFOREGROUND | MB_ICONSTOP);
-               }
-               else
-                       MessageBox(NULL, text, "Double Quake Error", MB_OK | MB_SETFOREGROUND | MB_ICONSTOP);
+               in_sys_error0 = 1;
+               VID_Shutdown();
        }
+       MessageBox(NULL, text, "Quake Error", MB_OK | MB_SETFOREGROUND | MB_ICONSTOP);
 
        if (!in_sys_error1)
        {
@@ -142,6 +106,13 @@ void Sys_Quit (void)
        exit (0);
 }
 
+void Sys_Print(const char *text)
+{
+       DWORD dummy;
+       extern HANDLE houtput;
+       if (cls.state == ca_dedicated)
+               WriteFile(houtput, text, strlen (text), &dummy, NULL);
+}
 
 /*
 ================
@@ -346,15 +317,14 @@ WinMain
 */
 HINSTANCE      global_hInstance;
 int                    global_nCmdShow;
-char           *argv[MAX_NUM_ARGVS];
-static char    *empty_string = "";
+const char     *argv[MAX_NUM_ARGVS];
+char           program_name[MAX_OSPATH];
 
 int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow)
 {
-       double                  frameoldtime, framenewtime;
-       MEMORYSTATUS    lpBuffer;
-       static  char    cwd[1024];
-       int                             t;
+       double frameoldtime, framenewtime;
+       MEMORYSTATUS lpBuffer;
+       int t;
 
        /* previous instances do not exist in Win32 */
        if (hPrevInstance)
@@ -366,28 +336,20 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin
        lpBuffer.dwLength = sizeof(MEMORYSTATUS);
        GlobalMemoryStatus (&lpBuffer);
 
-       if (!GetCurrentDirectory (sizeof(cwd), cwd))
-               Sys_Error ("Couldn't determine current directory");
-
-       if (cwd[strlen(cwd)-1] == '/')
-               cwd[strlen(cwd)-1] = 0;
-
-       memset(&host_parms, 0, sizeof(host_parms));
-
-       host_parms.basedir = cwd;
-
-       host_parms.argc = 1;
-       argv[0] = empty_string;
+       com_argc = 1;
+       program_name[sizeof(program_name)-1] = 0;
+       GetModuleFileNameA(NULL, program_name, sizeof(program_name) - 1);
+       argv[0] = program_name;
 
-       while (*lpCmdLine && (host_parms.argc < MAX_NUM_ARGVS))
+       while (*lpCmdLine && (com_argc < MAX_NUM_ARGVS))
        {
                while (*lpCmdLine && ((*lpCmdLine <= 32) || (*lpCmdLine > 126)))
                        lpCmdLine++;
 
                if (*lpCmdLine)
                {
-                       argv[host_parms.argc] = lpCmdLine;
-                       host_parms.argc++;
+                       argv[com_argc] = lpCmdLine;
+                       com_argc++;
 
                        while (*lpCmdLine && ((*lpCmdLine > 32) && (*lpCmdLine <= 126)))
                                lpCmdLine++;
@@ -399,7 +361,7 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin
                        }
                }
        }
-       host_parms.argv = argv;
+       com_argv = argv;
 
        Sys_Shared_EarlyInit();