From 8b9523640a398e283aa2437fa7f01b5e77a59bfa Mon Sep 17 00:00:00 2001
From: terminx <terminx@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Mon, 1 May 2006 07:38:13 +0000
Subject: [PATCH] git-svn-id: https://svn.eduke32.com/eduke32@133
 1a8010ca-5511-0410-912e-c29ae57300e0

---
 polymer/eduke32/source/game.c    |  2 +-
 polymer/eduke32/source/wrapper.c | 21 +++++++++++----------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/polymer/eduke32/source/game.c b/polymer/eduke32/source/game.c
index 79074f695..ed33d2084 100644
--- a/polymer/eduke32/source/game.c
+++ b/polymer/eduke32/source/game.c
@@ -7471,7 +7471,7 @@ enum {
 };
 
 signed int rancid_players = 0;
-char rancid_ips[MAXPLAYERS+1][16];
+char rancid_ips[MAXPLAYERS][16];
 
 typedef struct { char *text; int tokenid; } tokenlist;
 static tokenlist basetokens[] =
diff --git a/polymer/eduke32/source/wrapper.c b/polymer/eduke32/source/wrapper.c
index b34e06595..3d270e775 100755
--- a/polymer/eduke32/source/wrapper.c
+++ b/polymer/eduke32/source/wrapper.c
@@ -10,33 +10,33 @@
 int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInst, LPSTR lpCmdLine, int nCmdShow)
 {
     int i,j;
+    char CmdLine[1024], sCmdLine[1024], szFileName[255];
     LPTSTR szCmdLine;
 
-    char CmdLine[1024];
-    char sCmdLine[1024];
-    char szFileName[255];
-
     FILE * fp=fopen("wrapper.log","w");
     STARTUPINFO si;
     PROCESS_INFORMATION pi;
 
-    ZeroMemory(&szFileName,sizeof(szFileName));
     strcpy(sCmdLine,lpCmdLine);
-    for(i=0;i<(signed)strlen(sCmdLine);i++)
+
+    i = 0;
+
+    while(i < (signed)strlen(sCmdLine))
     {
         if(sCmdLine[i] == '-' && sCmdLine[i+1] == 'n' && sCmdLine[i+2] == 'e' && sCmdLine[i+3] == 't')
         {
+            CmdLine[i-1] = '\0';
             j = 0,i += 5;
-            while(!sCmdLine[i] != ' ' && i<(signed)strlen(sCmdLine))
+            while(sCmdLine[i] != ' ' && i < (signed)strlen(sCmdLine))
             {
                 szFileName[j] = sCmdLine[i];
-                if(sCmdLine[i+1] == ' ')
-                    break;
                 j++,i++;
             }
+            szFileName[j] = '\0';
             break;
         }
         else CmdLine[i] = sCmdLine[i];
+        i++;
     }
 
     if(szFileName[0])
@@ -59,7 +59,8 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInst, LPSTR lpCmdLine, in
     if (!CreateProcess(NULL,szCmdLine,NULL,NULL,0,0,NULL,NULL,&si,&pi)) {
         MessageBox(0,"Failed to start eduke32.exe.", "Failure starting game", MB_OK|MB_ICONSTOP);
         return 1;
-    }
+    } else WaitForSingleObject(pi.hProcess,INFINITE);
+
     return 0;
 }