breakup walk system and add new exit animation

[carveJwlIkooP6JGAAIwe30JlM.git] / input.h

diff --git a/input.h b/input.h
index b742119bb783c915cd1fc63b1c55256ccb36a683..2a19b40e9b2c715424212ff5e3a7cc833ad59c39 100644 (file)
--- a/input.h
+++ b/input.h
@@ -12,6 +12,7 @@
 enum sr_bind{
    k_srbind_jump = 0,
    k_srbind_push,
+   k_srbind_skid,
    k_srbind_trick0,
    k_srbind_trick1,
    k_srbind_trick2,
@@ -35,10 +36,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,
 };
 
@@ -54,6 +56,7 @@ enum sr_axis{
    k_sraxis_mbrowse_h,
    k_sraxis_mbrowse_v,
    k_sraxis_replay_h,
+   k_sraxis_skid,
    k_sraxis_max
 };
 
@@ -77,10 +80,10 @@ static vg_input_op *input_button_list[] = {
    vg_mode_absmax, vg_joy_button, SDL_CONTROLLER_BUTTON_X, vg_end 
 },
 [k_srbind_use]   = INPUT_BASIC( SDLK_e, SDL_CONTROLLER_BUTTON_Y ),
-[k_srbind_reset] = INPUT_BASIC( SDLK_r, SDL_CONTROLLER_BUTTON_LEFTSHOULDER ),
+[k_srbind_reset] = INPUT_BASIC( SDLK_r, SDL_CONTROLLER_BUTTON_DPAD_LEFT ),
 [k_srbind_dead_respawn] =
-   INPUT_BASIC( SDLK_q, SDL_CONTROLLER_BUTTON_RIGHTSHOULDER ),
-[k_srbind_camera]= INPUT_BASIC( SDLK_c, SDL_CONTROLLER_BUTTON_RIGHTSHOULDER ),
+   INPUT_BASIC( SDLK_q, SDL_CONTROLLER_BUTTON_DPAD_RIGHT ),
+[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 ),
 [k_srbind_world_left] = 
@@ -104,6 +107,7 @@ 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 ] = INPUT_BASIC( SDLK_LSHIFT, SDL_CONTROLLER_BUTTON_X ),
 
 [k_srbind_miniworld_resume]  = (vg_input_op[]){
    vg_keyboard, SDLK_RETURN, vg_gui_visible, 0,
@@ -113,7 +117,8 @@ 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
 };
 
@@ -125,13 +130,13 @@ static vg_input_op *input_axis_list[] = {
 [k_sraxis_mbrowse_h] = (vg_input_op[]){
    vg_mode_sub, vg_keyboard, SDLK_LEFT,
    vg_mode_add, vg_keyboard, SDLK_RIGHT,
-   vg_mode_absmax, vg_joy_axis, SDL_CONTROLLER_AXIS_LEFTX,
+   vg_mode_add, vg_joy_axis, SDL_CONTROLLER_AXIS_LEFTX,
    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_absmax, vg_joy_axis, SDL_CONTROLLER_AXIS_LEFTY,
+   vg_mode_sub, vg_joy_axis, SDL_CONTROLLER_AXIS_LEFTY,
    vg_end
 },
 [k_sraxis_replay_h] = (vg_input_op[]){
@@ -141,6 +146,11 @@ static vg_input_op *input_axis_list[] = {
    vg_mode_sub, vg_joy_axis, SDL_CONTROLLER_AXIS_TRIGGERLEFT,
    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_end
+},
 [k_sraxis_max]=NULL
 };