projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add one shots to replay buffer
[carveJwlIkooP6JGAAIwe30JlM.git]
/
input.h
diff --git
a/input.h
b/input.h
index c66b7fb774e4a30cfe9f4477c09da15502aa4db2..275c6a441217d6d3b2e8b66d862e8eb0b2574840 100644
(file)
--- a/
input.h
+++ b/
input.h
@@
-12,12
+12,14
@@
enum sr_bind{
k_srbind_jump = 0,
k_srbind_push,
enum sr_bind{
k_srbind_jump = 0,
k_srbind_push,
+ k_srbind_skid,
k_srbind_trick0,
k_srbind_trick1,
k_srbind_trick2,
k_srbind_sit,
k_srbind_use,
k_srbind_reset,
k_srbind_trick0,
k_srbind_trick1,
k_srbind_trick2,
k_srbind_sit,
k_srbind_use,
k_srbind_reset,
+ k_srbind_dead_respawn,
k_srbind_camera,
k_srbind_mleft,
k_srbind_mright,
k_srbind_camera,
k_srbind_mleft,
k_srbind_mright,
@@
-34,10
+36,11
@@
enum sr_bind{
k_srbind_home,
k_srbind_lobby,
k_srbind_chat,
k_srbind_home,
k_srbind_lobby,
k_srbind_chat,
+ k_srbind_run,
k_srbind_miniworld_teleport,
k_srbind_miniworld_resume,
k_srbind_miniworld_teleport,
k_srbind_miniworld_resume,
-
+ k_srbind_devbutton,
k_srbind_max,
};
k_srbind_max,
};
@@
-53,6
+56,7
@@
enum sr_axis{
k_sraxis_mbrowse_h,
k_sraxis_mbrowse_v,
k_sraxis_replay_h,
k_sraxis_mbrowse_h,
k_sraxis_mbrowse_v,
k_sraxis_replay_h,
+ k_sraxis_skid,
k_sraxis_max
};
k_sraxis_max
};
@@
-76,8
+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 ),
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_camera]= INPUT_BASIC( SDLK_c, SDL_CONTROLLER_BUTTON_RIGHTSHOULDER ),
+[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 ),
+[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] =
[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] =
@@
-101,6
+107,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_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,
[k_srbind_miniworld_resume] = (vg_input_op[]){
vg_keyboard, SDLK_RETURN, vg_gui_visible, 0,
@@
-108,8
+116,10
@@
static vg_input_op *input_button_list[] = {
vg_gui_visible, 1,
vg_joy_button, SDL_CONTROLLER_BUTTON_X, vg_end
},
vg_gui_visible, 1,
vg_joy_button, SDL_CONTROLLER_BUTTON_X, vg_end
},
-[k_srbind_miniworld_teleport]= INPUT_BASIC( SDLK_r, SDL_CONTROLLER_BUTTON_X ),
-
+[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
};
[k_srbind_max]=NULL
};
@@
-121,13
+131,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,
[k_sraxis_mbrowse_h] = (vg_input_op[]){
vg_mode_sub, vg_keyboard, SDLK_LEFT,
vg_mode_add, vg_keyboard, SDLK_RIGHT,
- vg_mode_a
bsmax
, vg_joy_axis, SDL_CONTROLLER_AXIS_LEFTX,
+ vg_mode_a
dd
, 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_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[]){
vg_end
},
[k_sraxis_replay_h] = (vg_input_op[]){
@@
-137,6
+147,11
@@
static vg_input_op *input_axis_list[] = {
vg_mode_sub, vg_joy_axis, SDL_CONTROLLER_AXIS_TRIGGERLEFT,
vg_end
},
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
};
[k_sraxis_max]=NULL
};