From 383a00cd9c13146516fb1dbbb214c08988ca50ae Mon Sep 17 00:00:00 2001 From: zicodxx Date: Wed, 16 May 2012 01:06:13 +0200 Subject: [PATCH] In Multiplayer when taking damage, the game will only leave menus when shield drop below 5 --- CHANGELOG.txt | 4 ++++ main/game.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 457e508b3..8f860d1e6 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,5 +1,9 @@ D1X-Rebirth Changelog +20120516 +-------- +main/game.c: In Multiplayer when taking damage, the game will only leave menus when shield drop below 5 + 20120515 -------- main/net_udp.c: Do not send endlevel packets to disconnected (but still saved) clients; Do not allow ports below 1024; More verbosity for udp_open_socket() diff --git a/main/game.c b/main/game.c index 118b7785a..2d33792b3 100644 --- a/main/game.c +++ b/main/game.c @@ -1239,7 +1239,7 @@ void GameProcessFrame(void) } // Check if we have to close in-game menus for multiplayer - if (Endlevel_sequence || (Player_is_dead != player_was_dead) || (Players[Player_num].shields < player_shields)) + if (Endlevel_sequence || (Player_is_dead != player_was_dead) || ((Players[Player_num].shields < player_shields) && Players[Player_num].shields < 5)) game_leave_menus(); if ((Control_center_destroyed && !was_fuelcen_destroyed) || ((Control_center_destroyed) && (Countdown_seconds_left < 10)))