In Multiplayer when taking damage, the game will only leave menus when shield drop below 5

This commit is contained in:
zicodxx 2012-05-16 01:06:16 +02:00
parent 1c8dc35257
commit 8699ae6b63
2 changed files with 5 additions and 1 deletions

View file

@ -1,5 +1,9 @@
D2X-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()

View file

@ -1488,7 +1488,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)))