allow PAUSE key during death sequence to pause or view multiplayer game stats; Also reset hostages_on_board when ship blows up so pause menu during death sequence will show 0 hostages soon as the ship explodes; fixed crash for slew_init by removing old numlock hack
This commit is contained in:
parent
a7420efb13
commit
e7c86fd11d
|
@ -4,6 +4,7 @@ D1X-Rebirth Changelog
|
||||||
--------
|
--------
|
||||||
main/game.c: In Multiplayer when taking damage, the game will only leave menus when shield drop below 5
|
main/game.c: In Multiplayer when taking damage, the game will only leave menus when shield drop below 5
|
||||||
main/net_udp.c: when updating game info also check for player connected status in case we send to everyone
|
main/net_udp.c: when updating game info also check for player connected status in case we send to everyone
|
||||||
|
main/gamecntl.c, main/object.c: allow PAUSE key during death sequence to pause or view multiplayer game stats; Also reset hostages_on_board when ship blows up so pause menu during death sequence will show 0 hostages soon as the ship explodes; fixed crash for slew_init by removing old numlock hack
|
||||||
|
|
||||||
20120515
|
20120515
|
||||||
--------
|
--------
|
||||||
|
|
|
@ -338,7 +338,7 @@ int HandleDeathInput(d_event *event)
|
||||||
{
|
{
|
||||||
int key = event_key_get(event);
|
int key = event_key_get(event);
|
||||||
|
|
||||||
if (Player_exploded && !key_isfunc(key) && key)
|
if (Player_exploded && !key_isfunc(key) && key != KEY_PAUSE && key)
|
||||||
Death_sequence_aborted = 1; //Any key but func or modifier aborts
|
Death_sequence_aborted = 1; //Any key but func or modifier aborts
|
||||||
if (key == KEY_ESC)
|
if (key == KEY_ESC)
|
||||||
if (ConsoleObject->flags & OF_EXPLODING)
|
if (ConsoleObject->flags & OF_EXPLODING)
|
||||||
|
|
|
@ -1413,12 +1413,13 @@ void dead_player_frame(void)
|
||||||
if (time_dead > DEATH_SEQUENCE_EXPLODE_TIME) {
|
if (time_dead > DEATH_SEQUENCE_EXPLODE_TIME) {
|
||||||
if (!Player_exploded) {
|
if (!Player_exploded) {
|
||||||
|
|
||||||
if (Players[Player_num].hostages_on_board > 1)
|
if (Players[Player_num].hostages_on_board > 1)
|
||||||
HUD_init_message(HM_DEFAULT, TXT_SHIP_DESTROYED_2, Players[Player_num].hostages_on_board);
|
HUD_init_message(HM_DEFAULT, TXT_SHIP_DESTROYED_2, Players[Player_num].hostages_on_board);
|
||||||
else if (Players[Player_num].hostages_on_board == 1)
|
else if (Players[Player_num].hostages_on_board == 1)
|
||||||
HUD_init_message(HM_DEFAULT, TXT_SHIP_DESTROYED_1);
|
HUD_init_message(HM_DEFAULT, TXT_SHIP_DESTROYED_1);
|
||||||
else
|
else
|
||||||
HUD_init_message(HM_DEFAULT, TXT_SHIP_DESTROYED_0);
|
HUD_init_message(HM_DEFAULT, TXT_SHIP_DESTROYED_0);
|
||||||
|
Players[Player_num].hostages_on_board = 0;
|
||||||
|
|
||||||
Player_exploded = 1;
|
Player_exploded = 1;
|
||||||
#ifdef NETWORK
|
#ifdef NETWORK
|
||||||
|
@ -1675,7 +1676,6 @@ void object_move_one( object * obj )
|
||||||
if ( keyd_pressed[KEY_PAD5] ) slew_stop( obj );
|
if ( keyd_pressed[KEY_PAD5] ) slew_stop( obj );
|
||||||
if ( keyd_pressed[KEY_NUMLOCK] ) {
|
if ( keyd_pressed[KEY_NUMLOCK] ) {
|
||||||
slew_reset_orient( obj );
|
slew_reset_orient( obj );
|
||||||
* (ubyte *) 0x417 &= ~0x20; //kill numlock
|
|
||||||
}
|
}
|
||||||
slew_frame(0 ); // Does velocity addition for us.
|
slew_frame(0 ); // Does velocity addition for us.
|
||||||
break;
|
break;
|
||||||
|
|
Loading…
Reference in a new issue