review activity switching

[carveJwlIkooP6JGAAIwe30JlM.git] / input.h

diff --git a/input.h b/input.h
index b4262bc0f0ef9a08e460e7338d8266a330c8a30e..fe387ccdd47a4d0d59bf903a7a07170ef0b41bb6 100644 (file)
--- a/input.h
+++ b/input.h
@@ -46,7 +46,7 @@ struct {
    float axis_states[ k_sraxis_max ][2];
    v2f joystick_states[ k_srjoystick_max ][2];
    u8 button_states[ k_srbind_max ][2];
-   u32 ignore_input_frames;
+   u32 enabled;
 }
 static srinput;
 
@@ -182,7 +182,7 @@ static const char *joystick_display_string( enum sr_joystick joystick,
 
 static int buttons_filter_fixed(void)
 {
-   if( srinput.ignore_input_frames ) return 1;
+   if( !srinput.enabled ) return 1;
    if( vg_ui.wants_mouse ) return 1;
 
    if( vg.engine_stage == k_engine_stage_update_fixed )
@@ -244,9 +244,6 @@ static void setbtn( enum sr_bind button, u8 value )
 
 static void skaterift_preupdate_inputs(void)
 {
-   if( srinput.ignore_input_frames )
-      srinput.ignore_input_frames --;
-
    for( u32 i=0; i<k_srbind_max; i++ ){
       srinput.button_states[i][1] = srinput.button_states[i][0];
       srinput.button_states[i][0] = 0;