added clearing network players from main menu screen if server disconnects

[rocksndiamonds.git] / src / network.c

diff --git a/src/network.c b/src/network.c
index c4e2ee6e09016cd6b9aab2c7af937986a8241c9b..e703da0cd8a25ef326488c17ef6c440c2923de61 100644 (file)
--- a/src/network.c
+++ b/src/network.c
@@ -518,6 +518,9 @@ static void Handle_OP_NUMBER_WANTED()
     Error(ERR_NETWORK_CLIENT, "cannot switch -- you keep client # %d",
          new_client_nr);
   }
+
+  if (game_status == GAME_MODE_MAIN)
+    DrawNetworkPlayers();
 }
 
 static void Handle_OP_PLAYER_NAME(unsigned int len)
@@ -591,6 +594,10 @@ static void Handle_OP_PLAYER_DISCONNECTED()
 
     DrawMainMenu();
   }
+  else if (game_status == GAME_MODE_MAIN)
+  {
+    DrawNetworkPlayers();
+  }
 }
 
 static void Handle_OP_START_PLAYING()
@@ -659,19 +666,21 @@ static void Handle_OP_STOP_PLAYING()
     int index_nr = client_nr - 1;
     struct PlayerInfo *client_player = &stored_player[index_nr];
     boolean stopped_by_remote_player = (!client_player->connected_locally);
-    char *message = (buffer[2] == NETWORK_STOP_BY_PLAYER ?
-                    "Network game stopped by player!" :
-                    buffer[2] == NETWORK_STOP_BY_ERROR ?
-                    "Network game stopped due to internal error!" :
-                    "Network game stopped!");
+    char message[100];
+
+    sprintf(message, (buffer[2] == NETWORK_STOP_BY_PLAYER ?
+                     "Network game stopped by player %d!" :
+                     buffer[2] == NETWORK_STOP_BY_ERROR ?
+                     "Network game stopped due to internal error!" :
+                     "Network game stopped!"), client_nr);
 
     if (buffer[2] != NETWORK_STOP_BY_PLAYER || stopped_by_remote_player)
       Request(message, REQ_CONFIRM | REQ_STAY_CLOSED);
-  }
 
-  SetGameStatus(GAME_MODE_MAIN);
+    SetGameStatus(GAME_MODE_MAIN);
 
-  DrawMainMenu();
+    DrawMainMenu();
+  }
 }
 
 static void Handle_OP_MOVE_PLAYER(unsigned int len)
@@ -850,6 +859,9 @@ void HandleNetworking()
     else
     {
       Request(error_message, REQ_CONFIRM);
+
+      if (game_status == GAME_MODE_MAIN)
+       ClearNetworkPlayers();
     }
   }
 }