Multiplayer: host receives correct defeat message (dkfans#4852)

Author: rainlizard

src/front_input.c

@@ -832,7 +832,7 @@ static short get_global_inputs(void)
       return true;
   if (player->victory_state != VicS_Undecided && is_game_key_pressed(Gkey_FinishLevel, true, false))
       {
-        if (player->victory_state == VicS_LostLevel && network_is_active() && player->id_number == get_host_player_id())
+        if ((player->victory_state == VicS_LostLevel) && network_is_active() && (player->id_number == get_host_player_id()) && network_human_contenders_remain())
         {
             return true;
         }

src/frontend.cpp

@@ -3453,7 +3453,7 @@ void update_player_objectives(PlayerNumber plyr_idx)
           break;
       case VicS_LostLevel:
           TextStringId msg_idx = CpgStr_LevelLost;
-          if (network_is_active() && player->id_number == get_host_player_id()) {
+          if (network_is_active() && (player->id_number == get_host_player_id()) && network_human_contenders_remain()) {
               msg_idx = GUIStr_NetHostLostWaitingForPlayers;
           }
           set_level_objective(player->id_number, get_string(msg_idx));

src/net_game.c

@@ -324,6 +324,17 @@ static TbBool network_has_remote_enemies_remaining(void)
     return false;
 }
 
+TbBool network_human_contenders_remain(void)
+{
+    for (PlayerNumber player_idx = 0; player_idx < PLAYERS_COUNT; player_idx++) {
+        struct PlayerInfo *player = get_player(player_idx);
+        if (player_exists(player) && (player->is_active == 1) && ((player->allocflags & PlaF_CompCtrl) == 0) && !player_cannot_win(player_idx)) {
+            return true;
+        }
+    }
+    return false;
+}
+
 static TbBool network_has_remote_users_remaining(void)
 {
     for (NetUserId user_id = 0; user_id < (NetUserId)netstate.max_players; user_id += 1) {

src/net_game.h

@@ -50,6 +50,7 @@ long network_session_join(void);
 
 TbBool network_player_active(int plyr_idx);
 const char *network_player_name(int plyr_idx);
+TbBool network_human_contenders_remain(void);
 void process_player_leave_game_packet(struct PlayerInfo *player);
 void process_disconnected_network_players(void);
 void sync_initial_network_seed(void);

src/packets.c

@@ -653,7 +653,7 @@ TbBool process_players_global_packet_action(PlayerNumber plyr_idx)
             quit_game = 1;
           }
           return 0;
-        } else if (host_packet && (victory_state == VicS_LostLevel)) {
+        } else if (host_packet && (victory_state == VicS_LostLevel) && network_human_contenders_remain()) {
           return 0;
         } else if (host_packet && (victory_state == VicS_WonLevel)) {
           player->additional_flags &= ~PlaAF_UnlockedLordTorture;