projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
PC controls for skids
[carveJwlIkooP6JGAAIwe30JlM.git]
/
input.h
diff --git
a/input.h
b/input.h
index b742119bb783c915cd1fc63b1c55256ccb36a683..e93409b1356fefca51248be6bebea5d7f14ff765 100644
(file)
--- a/
input.h
+++ b/
input.h
@@
-12,6
+12,7
@@
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_trick0,
k_srbind_trick1,
k_srbind_trick2,
@@
-54,6
+55,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
};
@@
-77,10
+79,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_reset] = INPUT_BASIC( SDLK_r, SDL_CONTROLLER_BUTTON_
DPAD_LEFT
),
[k_srbind_dead_respawn] =
[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] =
[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] =
@@
-113,7
+115,7
@@
static vg_input_op *input_button_list[] = {
},
[k_srbind_miniworld_teleport]= INPUT_BASIC( SDLK_q,
SDL_CONTROLLER_BUTTON_LEFTSHOULDER ),
},
[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_max]=NULL
};
[k_srbind_max]=NULL
};
@@
-125,13
+127,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[]){
@@
-141,6
+143,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
};