spawning fixes

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@2750 e016b1c5-ed68-44aa-a2f7-31cac88cffde

source/src/clients2c.cpp

@@ -152,11 +152,6 @@ void parsemessages(int cn, playerent *d, ucharbuf &p)
             player1->clientnum = mycn;      // we are now fully connected
 			joining = getint(p);
             if(getint(p) > 0) conoutf("INFO: this server is password protected");
-			if(joining<0 && getclientmap()[0]) // we are the first client on this server, set map
-            {
-                nextmode = gamemode;
-                changemap(getclientmap());
-            }
             break;
         }
 
@@ -747,6 +742,13 @@ void parsemessages(int cn, playerent *d, ucharbuf &p)
             neterr("type");
             return;
     }
+
+    // check if joining here so as not to interrupt welcomepacket
+    if(joining<0 && getclientmap()[0]) // we are the first client on this server, set map
+    {
+        nextmode = gamemode;
+        changemap(getclientmap());
+    }
 }
 
 void receivefile(uchar *data, int len)