From b2864581198b2fea4fb828f7316a61764a355f88 Mon Sep 17 00:00:00 2001 From: zico Date: Sat, 5 Dec 2015 13:12:21 +0100 Subject: [PATCH] Upon user request: reverted commits 1c8dc35 and 1431d3bc so the game will automatically close menus and automap upon taking damage in multiplayer - restoring the original game behavior --- similar/main/game.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/similar/main/game.cpp b/similar/main/game.cpp index 4ae927caf..10bcaa513 100644 --- a/similar/main/game.cpp +++ b/similar/main/game.cpp @@ -1494,9 +1494,8 @@ void GameProcessFrame(void) // Check if we have to close in-game menus for multiplayer if ((Game_mode & GM_MULTI) && (get_local_player().connected == CONNECT_PLAYING)) { - if ( Endlevel_sequence || ((Control_center_destroyed) && (Countdown_seconds_left <= 1)) || // close menus when end of level... - (Automap_active && ((Player_is_dead != player_was_dead) || (get_local_player_shields()<=0 && player_shields>0))) ) // close autmap when dying ... - game_leave_menus(); + if (Endlevel_sequence || (Player_is_dead != player_was_dead) || (get_local_player_shields() < player_shields) || (Control_center_destroyed && Countdown_seconds_left < 10)) + game_leave_menus(); } }