added setting network connection flag for network games

[rocksndiamonds.git] / src / init.c

diff --git a/src/init.c b/src/init.c
index 8dec027785859377910914d56630c8a05aeeadd9..7413cd52e53f5b9695e02e3697c8f57a46d4ccde 100644 (file)
--- a/src/init.c
+++ b/src/init.c
@@ -5616,17 +5616,25 @@ void InitNetworkSettings()
 
 void InitNetworkServer()
 {
-  if (!network.enabled)
+  if (!network.enabled || network.connected)
     return;
 
-#if defined(NETWORK_AVALIABLE)
   if (!ConnectToServer(network.server_host, network.server_port))
-    Error(ERR_EXIT, "cannot connect to network game server");
+  {
+    Request("Cannot connect to network server!", REQ_CONFIRM);
+
+    network.enabled = FALSE;
+
+    setup.network_mode = FALSE;
+
+    return;
+  }
 
   SendToServer_PlayerName(setup.player_name);
   SendToServer_ProtocolVersion();
   SendToServer_NrWanted(setup.network_player_nr + 1);
-#endif
+
+  network.connected = TRUE;
 }
 
 static boolean CheckArtworkConfigForCustomElements(char *filename)