From 8b4a0e26d9037b80593d5cac1ff9fb11268e06af Mon Sep 17 00:00:00 2001 From: Jbleezy Date: Mon, 15 May 2023 01:00:50 -0700 Subject: [PATCH] Encounter: fix game ending if player leaves when all players are down --- scripts/zm/replaced/_zm.gsc | 3 ++- scripts/zm/zgrief/zgrief_reimagined.gsc | 12 ++---------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/scripts/zm/replaced/_zm.gsc b/scripts/zm/replaced/_zm.gsc index 55b87bd8..30eb0c34 100644 --- a/scripts/zm/replaced/_zm.gsc +++ b/scripts/zm/replaced/_zm.gsc @@ -652,6 +652,7 @@ wait_for_all_players_ready() { flag_init( "all_players_ready" ); + prev_no_end_game_check = level.no_end_game_check; level.no_end_game_check = 1; if ( !isDefined(level.pregame_hud) ) @@ -786,7 +787,7 @@ wait_for_all_players_ready() level.ready_up_hud destroy(); level.pregame_hud destroy(); - level.no_end_game_check = undefined; + level.no_end_game_check = prev_no_end_game_check; flag_set( "all_players_ready" ); } diff --git a/scripts/zm/zgrief/zgrief_reimagined.gsc b/scripts/zm/zgrief/zgrief_reimagined.gsc index 97252bea..1da92a4c 100644 --- a/scripts/zm/zgrief/zgrief_reimagined.gsc +++ b/scripts/zm/zgrief/zgrief_reimagined.gsc @@ -744,17 +744,9 @@ grief_onplayerdisconnect(disconnecting_player) } } - players = get_players(); - count = 0; - foreach(player in players) - { - if(player != disconnecting_player && player.team == disconnecting_player.team) - { - count++; - } - } + count = countplayers(disconnecting_player.team) - 1; - if(count == 0) + if(count <= 0) { encounters_team = "A"; if(getOtherTeam(disconnecting_player.team) == "allies")