fix a warning on argv

[xonotic/darkplaces.git] / sys_win.c

diff --git a/sys_win.c b/sys_win.c
index a0c2ed038163f53e885f419c443863de79f2f220..acd3c16125cfbf9f1e634980151a666234c2e88a 100644 (file)
--- a/sys_win.c
+++ b/sys_win.c
@@ -103,7 +103,7 @@ void Sys_Error (const char *error, ...)
                if (!in_sys_error0)
                {
                        in_sys_error0 = 1;
-                       VID_SetDefaultMode ();
+                       VID_Shutdown();
                        MessageBox(NULL, text, "Quake Error", MB_OK | MB_SETFOREGROUND | MB_ICONSTOP);
                }
                else
@@ -346,14 +346,13 @@ 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;
 
        /* previous instances do not exist in Win32 */
@@ -366,24 +365,10 @@ 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.basedir = ".";
-#if CACHEENABLE
-       host_parms.cachedir = ".";
-#endif
-
        com_argc = 1;
-       argv[0] = empty_string;
+       program_name[sizeof(program_name)-1] = 0;
+       GetModuleFileNameA(NULL, program_name, sizeof(program_name) - 1);
+       argv[0] = program_name;
 
        while (*lpCmdLine && (com_argc < MAX_NUM_ARGVS))
        {