this should fix the program name in com_argv[0], so detection of which game to run...

[xonotic/darkplaces.git] / sys_win.c

diff --git a/sys_win.c b/sys_win.c
index 007dd01a02d62e67e5648ef34aea29baed583088..b966f58b4a92f608c9ba93039f653c21b9ba716e 100644 (file)
--- a/sys_win.c
+++ b/sys_win.c
@@ -45,130 +45,6 @@ static HANDLE       hFile;
 static HANDLE  heventParent;
 static HANDLE  heventChild;
 
-/*
-===============================================================================
-
-QFile IO
-
-===============================================================================
-*/
-
-// LordHavoc: 256 pak files (was 10)
-#define        MAX_HANDLES             256
-QFile  *sys_handles[MAX_HANDLES];
-
-int            findhandle (void)
-{
-       int             i;
-
-       for (i=1 ; i<MAX_HANDLES ; i++)
-               if (!sys_handles[i])
-                       return i;
-       Sys_Error ("out of handles");
-       return -1;
-}
-
-/*
-================
-Sys_FileLength
-================
-*/
-int Sys_FileLength (QFile *f)
-{
-       int             pos;
-       int             end;
-
-       pos = Qtell (f);
-       Qseek (f, 0, SEEK_END);
-       end = Qtell (f);
-       Qseek (f, pos, SEEK_SET);
-
-       return end;
-}
-
-int Sys_FileOpenRead (char *path, int *hndl)
-{
-       QFile   *f;
-       int             i, retval;
-
-       i = findhandle ();
-
-       f = Qopen(path, "rbz");
-
-       if (!f)
-       {
-               *hndl = -1;
-               retval = -1;
-       }
-       else
-       {
-               sys_handles[i] = f;
-               *hndl = i;
-               retval = Sys_FileLength(f);
-       }
-
-       return retval;
-}
-
-int Sys_FileOpenWrite (char *path)
-{
-       QFile   *f;
-       int             i;
-
-       i = findhandle ();
-
-       f = Qopen(path, "wb");
-       if (!f)
-       {
-               Con_Printf("Sys_FileOpenWrite: Error opening %s: %s", path, strerror(errno));
-               return 0;
-       }
-       sys_handles[i] = f;
-
-       return i;
-}
-
-void Sys_FileClose (int handle)
-{
-       Qclose (sys_handles[handle]);
-       sys_handles[handle] = NULL;
-}
-
-void Sys_FileSeek (int handle, int position)
-{
-       Qseek (sys_handles[handle], position, SEEK_SET);
-}
-
-int Sys_FileRead (int handle, void *dest, int count)
-{
-       return Qread (sys_handles[handle], dest, count);
-}
-
-int Sys_FileWrite (int handle, void *data, int count)
-{
-       return Qwrite (sys_handles[handle], data, count);
-}
-
-int    Sys_FileTime (char *path)
-{
-       QFile   *f;
-
-       f = Qopen(path, "rb");
-       if (f)
-       {
-               Qclose(f);
-               return 1;
-       }
-
-       return -1;
-}
-
-void Sys_mkdir (char *path)
-{
-       _mkdir (path);
-}
-
-
 /*
 ===============================================================================
 
@@ -179,7 +55,7 @@ SYSTEM IO
 
 void SleepUntilInput (int time);
 
-void Sys_Error (char *error, ...)
+void Sys_Error (const char *error, ...)
 {
        va_list         argptr;
        char            text[1024], text2[1024];
@@ -332,7 +208,11 @@ double Sys_DoubleTime (void)
        }
 
        if (newtime < oldtime)
-               Con_Printf("Sys_DoubleTime: time stepped backwards (went from %f to %f, difference %f)\n", oldtime, newtime, newtime - oldtime);
+       {
+               // warn if it's significant
+               if (newtime - oldtime < -0.01)
+                       Con_Printf("Sys_DoubleTime: time stepped backwards (went from %f to %f, difference %f)\n", oldtime, newtime, newtime - oldtime);
+       }
        else
                curtime += newtime - oldtime;
        oldtime = newtime;
@@ -467,49 +347,38 @@ WinMain
 HINSTANCE      global_hInstance;
 int                    global_nCmdShow;
 char           *argv[MAX_NUM_ARGVS];
-static char    *empty_string = "";
+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)
                return 0;
 
-       Cvar_RegisterVariable(&sys_usetimegettime);
-
        global_hInstance = hInstance;
        global_nCmdShow = nCmdShow;
 
        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;
+       com_argc = 1;
+       program_name[sizeof(program_name)-1] = 0;
+       GetModuleFileNameA(NULL, &program_name, sizeof(program_name - 1));
+       argv[0] = program_name;
 
-       memset(&host_parms, 0, sizeof(host_parms));
-
-       host_parms.basedir = cwd;
-
-       host_parms.argc = 1;
-       argv[0] = empty_string;
-
-       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++;
@@ -519,19 +388,14 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin
                                *lpCmdLine = 0;
                                lpCmdLine++;
                        }
-
                }
        }
-
-       host_parms.argv = argv;
-
-       COM_InitArgv (host_parms.argc, host_parms.argv);
-
-       host_parms.argc = com_argc;
-       host_parms.argv = com_argv;
+       com_argv = argv;
 
        Sys_Shared_EarlyInit();
 
+       Cvar_RegisterVariable(&sys_usetimegettime);
+
        tevent = CreateEvent(NULL, false, false, NULL);
 
        if (!tevent)