X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Finit.c;h=6db427ff5333ec44191426f5346ee4c32258df1e;hp=db1070e45d6e0eac883fa6701a1d02ecc1ec7dad;hb=6cf34a189f4a3707c9131652621dd67731f14f6b;hpb=e02ece0bdcbe2a883a0a104d8b33bf435ad169db

diff --git a/src/init.c b/src/init.c
index db1070e4..6db427ff 100644
--- a/src/init.c
+++ b/src/init.c
@@ -5051,6 +5051,9 @@ void Execute_Command(char *command)
   {
     Error(ERR_EXIT_HELP, "unrecognized command '%s'", command);
   }
+
+  /* disable networking if any valid command was recognized */
+  options.network = setup.network_mode = FALSE;
 }
 
 static void InitSetup()
@@ -5087,7 +5090,6 @@ static void InitPlayerInfo()
   }
 
   local_player->connected_locally = TRUE;
-  local_player->connected_network = TRUE;
 }
 
 static void InitArtworkInfo()
@@ -5487,6 +5489,8 @@ static void InitLevelInfo()
     if (leveldir_current == NULL)
       leveldir_current = getFirstValidTreeInfoEntry(leveldir_first);
   }
+
+  SetLevelSetInfo(leveldir_current->identifier, level_nr);
 }
 
 static void InitLevelArtworkInfo()
@@ -5621,8 +5625,6 @@ void InitNetworkServer()
 
   LimitScreenUpdates(FALSE);
 
-  ClearRectangle(drawto, 0, 0, WIN_XSIZE, WIN_YSIZE);
-
   if (!ConnectToServer(network.server_host, network.server_port))
   {
     network.enabled = FALSE;
@@ -5631,15 +5633,15 @@ void InitNetworkServer()
   }
   else
   {
-    SendToServer_PlayerName(setup.player_name);
     SendToServer_ProtocolVersion();
+    SendToServer_PlayerName(setup.player_name);
     SendToServer_NrWanted(setup.network_player_nr + 1);
 
     network.connected = TRUE;
   }
 
   /* short time to recognize result of network initialization */
-  Delay(1000);
+  Delay_WithScreenUpdates(1000);
 }
 
 static boolean CheckArtworkConfigForCustomElements(char *filename)