| version 1.20 | | version 1.21 |
|---|
| | |
| * Game loop for Inferno | | * Game loop for Inferno |
| * | | * |
| * $Log$ | | * $Log$ |
| | | * Revision 1.21 2000/04/19 21:27:56 sekmu |
| | | * movable death-cam from WraithX |
| | | * |
| * Revision 1.20 2000/01/17 05:43:13 donut | | * Revision 1.20 2000/01/17 05:43:13 donut |
| * fixed nicefps bug and added other modifier combos for hotkey menu/fullscreen keys | | * fixed nicefps bug and added other modifier combos for hotkey menu/fullscreen keys |
| * | | * |
| | |
| speedtest_frame(); | | speedtest_frame(); |
| #endif | | #endif |
| | | |
| if (!Endlevel_sequence && !Player_is_dead) { | | if (!Endlevel_sequence) { // && !Player_is_dead //this was taken out of the if statement by WraithX |
| | | |
| if ( (Newdemo_state == ND_STATE_PLAYBACK) | | if ( (Newdemo_state == ND_STATE_PLAYBACK) |
| #ifdef NETWORK | | #ifdef NETWORK |
| | |
| | | |
| check_rear_view(); | | check_rear_view(); |
| | | |
| | | |
| // If automap key pressed, enable automap unless you are in network mode, control center destroyed and < 10 seconds left | | // If automap key pressed, enable automap unless you are in network mode, control center destroyed and < 10 seconds left |
| if ( Controls.automap_down_count && !((Game_mode & GM_MULTI) && Fuelcen_control_center_destroyed && (Fuelcen_seconds_left < 10))) | | if ( Controls.automap_down_count && !((Game_mode & GM_MULTI) && Fuelcen_control_center_destroyed && (Fuelcen_seconds_left < 10))) |
| Automap_flag = 1; | | Automap_flag = 1; |
| | |
| } | | } |
| | | |
| //end edit - Victor Rachels | | //end edit - Victor Rachels |
| | | |
| } | | } |
| | | |
| if (Player_exploded) { //Player_is_dead && (ConsoleObject->flags & OF_EXPLODING) ) { | | if (Player_exploded) { //Player_is_dead && (ConsoleObject->flags & OF_EXPLODING) ) { |
| | |
| if (key_down_count(KEY_BACKSP)) | | if (key_down_count(KEY_BACKSP)) |
| Int3(); | | Int3(); |
| for (i=0; i<4; i++ ) | | for (i=0; i<4; i++ ) |
| | | //the following "if" added by WraithX, 4/17/00 |
| | | if (isJoyRotationKey(i) != 1) |
| | | { |
| if (joy_get_button_down_cnt(i)>0) Death_sequence_aborted = 1; | | if (joy_get_button_down_cnt(i)>0) Death_sequence_aborted = 1; |
| | | }//end "if" added by WraithX |
| | | |
| for (i=0; i<3; i++ ) | | for (i=0; i<3; i++ ) |
| | | //the following "if" added by WraithX, 4/17/00 |
| | | if (isMouseRotationKey(i) != 1) |
| | | { |
| if (mouse_button_down_count(i)>0) Death_sequence_aborted = 1; | | if (mouse_button_down_count(i)>0) Death_sequence_aborted = 1; |
| | | }//end "if" added by WraithX |
| | | |
| for (i=0; i<256; i++ ) { | | for (i=0; i<256; i++ ) { |
| | | //the following "if" added by WraithX, 4/17/00 |
| | | if (isKeyboardRotationKey(i) != 1) |
| | | { |
| if (key_down_count(i)>0) Death_sequence_aborted = 1; | | if (key_down_count(i)>0) Death_sequence_aborted = 1; |
| | | }//end "if" added by WraithX |
| | | |
| if (i == KEY_F1 - 1) // skip F.. keys | | if (i == KEY_F1 - 1) // skip F.. keys |
| i = KEY_F12; | | i = KEY_F12; |
| } | | } |