X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Finit.c;h=0a0c7580c460bd184622b944a91fb6e14d09b052;hb=2fe0fbc2a34fd4b50081f1829931dea3ca2c4c1c;hp=d466c7e5a215b132c128eaf448bb10478d08626f;hpb=e557b2b5d9951a4e692fd4e32a5cf45c84252c64;p=rocksndiamonds.git

diff --git a/src/init.c b/src/init.c
index d466c7e5..0a0c7580 100644
--- a/src/init.c
+++ b/src/init.c
@@ -44,11 +44,11 @@ struct IconFileInfo
 
 static int sound_process_id = 0;
 
-static void InitServer(void);
 static void InitLevelAndPlayerInfo(void);
+static void InitNetworkServer(void);
 static void InitDisplay(void);
 static void InitSound(void);
-static void InitSoundProcess(void);
+static void InitSoundServer(void);
 static void InitWindow(int, char **);
 static void InitGfx(void);
 static void LoadGfx(int, struct PictureFileInfo *);
@@ -57,11 +57,10 @@ static void InitElementProperties(void);
 void OpenAll(int argc, char *argv[])
 {
   InitLevelAndPlayerInfo();
-  InitServer();
 
   InitCounter();
   InitSound();
-  InitSoundProcess();
+  InitSoundServer();
   InitJoystick();
   InitRND(NEW_RANDOMIZE);
 
@@ -78,6 +77,8 @@ void OpenAll(int argc, char *argv[])
   InitElementProperties();
 
   DrawMainMenu();
+
+  InitNetworkServer();
 }
 
 void InitLevelAndPlayerInfo()
@@ -91,18 +92,25 @@ void InitLevelAndPlayerInfo()
   LoadPlayerInfo(PLAYER_LEVEL);		/* level specific info */
 }
 
-void InitServer()
+void InitNetworkServer()
 {
-  standalone = FALSE + TRUE;
+  int nr_wanted;
+
+  standalone = FALSE;
 
   if (standalone)
     return;
 
+  nr_wanted = Request("Choose player", REQ_PLAYER | REQ_STAY_CLOSED);
+
   if (!ConnectToServer(server_host, server_port))
     Error(ERR_EXIT, "cannot connect to multiplayer server");
 
-  SendNicknameToServer(local_player->alias_name);
-  SendProtocolVersionToServer();
+  SendToServer_Nickname(local_player->alias_name);
+  SendToServer_ProtocolVersion();
+
+  if (nr_wanted)
+    SendToServer_NrWanted(nr_wanted);
 }
 
 void InitSound()
@@ -153,7 +161,7 @@ void InitSound()
   }
 }
 
-void InitSoundProcess()
+void InitSoundServer()
 {
   if (sound_status==SOUND_OFF)
     return;