upgraded rtlights format to have separate ambient, diffuse, and specular intensity...

[xonotic/darkplaces.git] / sys_win.c

diff --git a/sys_win.c b/sys_win.c
index f53745e560ef2485da9e1631e1ac75ae2ad36e97..e261d04ddf5d046c9db2af7cb07eb8b02401e274 100644 (file)
--- a/sys_win.c
+++ b/sys_win.c
@@ -343,55 +343,46 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin
        lpBuffer.dwLength = sizeof(MEMORYSTATUS);
        GlobalMemoryStatus (&lpBuffer);
 
-       com_argc = 1;
        program_name[sizeof(program_name)-1] = 0;
        GetModuleFileNameA(NULL, program_name, sizeof(program_name) - 1);
+
+       com_argc = 1;
+       com_argv = argv;
        argv[0] = program_name;
 
        // FIXME: this tokenizer is rather redundent, call a more general one
        while (*lpCmdLine && (com_argc < MAX_NUM_ARGVS))
        {
-               while (*lpCmdLine && *lpCmdLine <= 32)
+               while (*lpCmdLine && *lpCmdLine <= ' ')
                        lpCmdLine++;
 
-               if (*lpCmdLine)
-               {
-                       if (*lpCmdLine == '\"')
-                       {
-                               // quoted string
-                               argv[com_argc] = lpCmdLine;
-                               com_argc++;
-
-                               while (*lpCmdLine && (*lpCmdLine != '\"'))
-                                       lpCmdLine++;
-
-                               if (*lpCmdLine)
-                               {
-                                       *lpCmdLine = 0;
-                                       lpCmdLine++;
-                               }
-
-                               if (*lpCmdLine == '\"')
-                                       lpCmdLine++;
-                       }
-                       else
-                       {
-                               // unquoted word
-                               argv[com_argc] = lpCmdLine;
-                               com_argc++;
+               if (!*lpCmdLine)
+                       break;
 
-                               while (*lpCmdLine && *lpCmdLine > 32)
-                                       lpCmdLine++;
+               if (*lpCmdLine == '\"')
+               {
+                       // quoted string
+                       lpCmdLine++;
+                       argv[com_argc] = lpCmdLine;
+                       com_argc++;
+                       while (*lpCmdLine && (*lpCmdLine != '\"'))
+                               lpCmdLine++;
+               }
+               else
+               {
+                       // unquoted word
+                       argv[com_argc] = lpCmdLine;
+                       com_argc++;
+                       while (*lpCmdLine && *lpCmdLine > ' ')
+                               lpCmdLine++;
+               }
 
-                               if (*lpCmdLine)
-                               {
-                                       *lpCmdLine = 0;
-                                       lpCmdLine++;
-                               }
-                       }
+               if (*lpCmdLine)
+               {
+                       *lpCmdLine = 0;
+                       lpCmdLine++;
                }
        }
-       com_argv = argv;
 
        Sys_Shared_EarlyInit();