X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Finit.c;h=9c9af0e90144197a94d2253ad0d38d50cb9e9c7d;hb=d621e281cdb7c66130b216b379fd88a45fb82afa;hp=b32141fbd7320ecbe26ab6769ea1961d4580e248;hpb=bd5cd06243740a2fac2a5ee5b026a23c5fd7eeb6;p=rocksndiamonds.git

diff --git a/src/init.c b/src/init.c
index b32141fb..9c9af0e9 100644
--- a/src/init.c
+++ b/src/init.c
@@ -5605,27 +5605,32 @@ static void InitArtworkDone()
   InitGlobalAnimations();
 }
 
-void InitNetworkServer()
+void InitNetworkSettings()
 {
-#if defined(NETWORK_AVALIABLE)
-  int nr_wanted;
-#endif
+  InitNetworkInfo(options.network || setup.network_mode,
+		  FALSE,
+		  options.serveronly,
+		  options.server_host,
+		  options.server_port);
+}
 
-  if (!options.network)
+void InitNetworkServer()
+{
+  if (!network.enabled)
     return;
 
-#if defined(NETWORK_AVALIABLE)
-  nr_wanted = Request("Choose player", REQ_PLAYER | REQ_STAY_CLOSED);
+  if (!ConnectToServer(network.server_host, network.server_port))
+  {
+    Request("Cannot connect to network server!", REQ_CONFIRM);
+
+    network.enabled = FALSE;
 
-  if (!ConnectToServer(options.server_host, options.server_port))
-    Error(ERR_EXIT, "cannot connect to network game server");
+    return;
+  }
 
   SendToServer_PlayerName(setup.player_name);
   SendToServer_ProtocolVersion();
-
-  if (nr_wanted)
-    SendToServer_NrWanted(nr_wanted);
-#endif
+  SendToServer_NrWanted(setup.network_player_nr + 1);
 }
 
 static boolean CheckArtworkConfigForCustomElements(char *filename)
@@ -5998,10 +6003,12 @@ void OpenAll()
   if (options.execute_command)
     Execute_Command(options.execute_command);
 
-  if (options.serveronly)
+  InitNetworkSettings();
+
+  if (network.serveronly)
   {
 #if defined(PLATFORM_UNIX)
-    NetworkServer(options.server_port, options.serveronly);
+    NetworkServer(network.server_port, TRUE);
 #else
     Error(ERR_WARN, "networking only supported in Unix version");
 #endif