Update spawn map to new UI

[carveJwlIkooP6JGAAIwe30JlM.git] / input.h

diff --git a/input.h b/input.h
index 12d27db5511000a979223d99b1fca54fd5999fab..2d4f30ea2c300b4a0b67eea1c9d03ea764de1bc7 100644 (file)
--- a/input.h
+++ b/input.h
@@ -5,7 +5,8 @@
 #include "vg/vg_m.h"
 #include "font.h"
 
-enum sr_bind{
+enum sr_bind
+{
    k_srbind_jump = 0,
    k_srbind_push,
    k_srbind_skid,
@@ -131,21 +132,21 @@ static vg_input_op *input_axis_list[] = {
    vg_end
 },
 [k_sraxis_mbrowse_v] = (vg_input_op[]){
-   vg_mode_add, vg_keyboard, SDLK_UP,
    vg_mode_sub, vg_keyboard, SDLK_DOWN,
+   vg_mode_add, vg_keyboard, SDLK_UP,
    vg_mode_sub, vg_joy_axis, SDL_CONTROLLER_AXIS_LEFTY,
    vg_end
 },
 [k_sraxis_replay_h] = (vg_input_op[]){
-   vg_mode_add, vg_keyboard, SDLK_e,
    vg_mode_sub, vg_keyboard, SDLK_q,
-   vg_mode_add, vg_joy_axis, SDL_CONTROLLER_AXIS_TRIGGERRIGHT,
+   vg_mode_add, vg_keyboard, SDLK_e,
    vg_mode_sub, vg_joy_axis, SDL_CONTROLLER_AXIS_TRIGGERLEFT,
+   vg_mode_add, vg_joy_axis, SDL_CONTROLLER_AXIS_TRIGGERRIGHT,
    vg_end
 },
 [k_sraxis_skid] = (vg_input_op[]){
-   vg_mode_add, vg_joy_button, SDL_CONTROLLER_BUTTON_RIGHTSHOULDER,
    vg_mode_sub, vg_joy_button, SDL_CONTROLLER_BUTTON_LEFTSHOULDER,
+   vg_mode_add, vg_joy_button, SDL_CONTROLLER_BUTTON_RIGHTSHOULDER,
    vg_end
 },
 [k_sraxis_max]=NULL
@@ -153,10 +154,10 @@ static vg_input_op *input_axis_list[] = {
 
 static vg_input_op *input_joy_list[] = {
 [k_srjoystick_steer] = (vg_input_op[]){
-   vg_index, 0, vg_mode_add, vg_keyboard, SDLK_d,
-                vg_mode_sub, vg_keyboard, SDLK_a,
-   vg_index, 1, vg_mode_add, vg_keyboard, SDLK_s,
-                vg_mode_sub, vg_keyboard, SDLK_w,
+   vg_index, 0, vg_mode_sub, vg_keyboard, SDLK_a,
+                vg_mode_add, vg_keyboard, SDLK_d,
+   vg_index, 1, vg_mode_sub, vg_keyboard, SDLK_w,
+                vg_mode_add, vg_keyboard, SDLK_s,
                 vg_mode_absmax, vg_joy_ls,
    vg_end
 },
@@ -185,8 +186,7 @@ struct {
 static srinput;
 
 static int input_filter_generic(void){
-   if( srinput.state != k_input_state_enabled || 
-       vg_ui.wants_mouse || vg_console.enabled || vg.settings_open )
+   if( srinput.state != k_input_state_enabled || vg_console.enabled )
       return 1;
    else 
       return 0;