Update spawn map to new UI

[carveJwlIkooP6JGAAIwe30JlM.git] / input.h

diff --git a/input.h b/input.h
index e93409b1356fefca51248be6bebea5d7f14ff765..2d4f30ea2c300b4a0b67eea1c9d03ea764de1bc7 100644 (file)
--- a/input.h
+++ b/input.h
@@ -1,15 +1,12 @@
-#ifndef INPUT_H
-#define INPUT_H
-
-#define VG_GAME
-#include "vg/vg.h"
+#pragma once
 #include "vg/vg_platform.h" 
 #include "vg/vg_console.h"
 #include "vg/vg_input.h"
 #include "vg/vg_m.h"
 #include "font.h"
 
-enum sr_bind{
+enum sr_bind
+{
    k_srbind_jump = 0,
    k_srbind_push,
    k_srbind_skid,
@@ -36,10 +33,11 @@ enum sr_bind{
    k_srbind_home,
    k_srbind_lobby,
    k_srbind_chat,
+   k_srbind_run,
    
    k_srbind_miniworld_teleport,
    k_srbind_miniworld_resume,
-
+   k_srbind_devbutton,
    k_srbind_max,
 };
 
@@ -81,7 +79,7 @@ static vg_input_op *input_button_list[] = {
 [k_srbind_use]   = INPUT_BASIC( SDLK_e, SDL_CONTROLLER_BUTTON_Y ),
 [k_srbind_reset] = INPUT_BASIC( SDLK_r, SDL_CONTROLLER_BUTTON_DPAD_LEFT ),
 [k_srbind_dead_respawn] =
-   INPUT_BASIC( SDLK_q, SDL_CONTROLLER_BUTTON_DPAD_RIGHT ),
+   INPUT_BASIC( SDLK_q, SDL_CONTROLLER_BUTTON_DPAD_UP ),
 [k_srbind_camera]= INPUT_BASIC( SDLK_c, SDL_CONTROLLER_BUTTON_DPAD_RIGHT ),
 [k_srbind_mleft] = INPUT_BASIC( SDLK_LEFT, SDL_CONTROLLER_BUTTON_DPAD_LEFT ),
 [k_srbind_mright]= INPUT_BASIC( SDLK_RIGHT, SDL_CONTROLLER_BUTTON_DPAD_RIGHT ),
@@ -106,6 +104,8 @@ static vg_input_op *input_button_list[] = {
 [k_srbind_sit]   = INPUT_BASIC( SDLK_z, SDL_CONTROLLER_BUTTON_B ),
 [k_srbind_lobby] = INPUT_BASIC( SDLK_TAB, SDL_CONTROLLER_BUTTON_DPAD_LEFT ),
 [k_srbind_chat ] = (vg_input_op[]){ vg_keyboard, SDLK_y, vg_end },
+[k_srbind_run ] = (vg_input_op[]){ vg_keyboard, SDLK_LSHIFT, 
+   vg_joy_axis, SDL_CONTROLLER_AXIS_TRIGGERLEFT, vg_end },
 
 [k_srbind_miniworld_resume]  = (vg_input_op[]){
    vg_keyboard, SDLK_RETURN, vg_gui_visible, 0,
@@ -116,6 +116,7 @@ static vg_input_op *input_button_list[] = {
 [k_srbind_miniworld_teleport]= INPUT_BASIC( SDLK_q, 
                                        SDL_CONTROLLER_BUTTON_LEFTSHOULDER ),
 [k_srbind_skid] = (vg_input_op[]){ vg_keyboard, SDLK_LCTRL, vg_end },
+[k_srbind_devbutton] = (vg_input_op[]){ vg_keyboard, SDLK_3, vg_end },
 [k_srbind_max]=NULL
 };
 
@@ -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 )
+   if( srinput.state != k_input_state_enabled || vg_console.enabled )
       return 1;
    else 
       return 0;
@@ -307,5 +307,3 @@ static void skaterift_preupdate_inputs(void){
       else           srinput.button_states[k_srbind_mdown][0] = 1;
    }
 }
-
-#endif /* INPUT_H */