ADWAIJDWAJ

[carveJwlIkooP6JGAAIwe30JlM.git] / player.h

diff --git a/player.h b/player.h
index 1edbc6ba08981fce86b63c8904294429ac6e95e8..f426b7daad07462dc915b518c36da249b0ff5fbc 100644 (file)
--- a/player.h
+++ b/player.h
@@ -413,6 +413,10 @@ VG_STATIC void player_mouseview(void)
    player.angles[1] = vg_clampf( player.angles[1], -VG_PIf*0.5f, VG_PIf*0.5f );
 }
 
+/* disaster */
+VG_STATIC int         menu_enabled(void);
+#include "menu.h"
+
 /* Deal with input etc */
 VG_STATIC void player_update_pre(void)
 {
@@ -423,7 +427,7 @@ VG_STATIC void player_update_pre(void)
       return;
    }
 
-   if( vg_input_button_down( player.input_reset ) )
+   if( vg_input_button_down( player.input_reset ) && !menu_enabled() )
    {
       if( player.is_dead )
       {
@@ -487,7 +491,7 @@ VG_STATIC void player_update_pre(void)
       }
    }
 
-   if( vg_input_button_down( player.input_switch_mode ) )
+   if( vg_input_button_down( player.input_switch_mode ) && !menu_enabled() )
    {
       phys->on_board ^= 0x1;
 
@@ -509,7 +513,7 @@ VG_STATIC void player_update_pre(void)
       player_mouseview();
 }
 
-VG_STATIC void player_update_fixed(void)                                    /* 2 */
+VG_STATIC void player_update_fixed(void)                                 /* 2 */
 {
    if( player.rewinding )
       return;