X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=input.h;h=aa546c9bccb85804f316f1ce606152da553b98b7;hb=4fa9aa9a1e09940e91cc30e171e3de0606515ef3;hp=7e1e6aa4f0afc84f6d16197ce1af1d9344b6dcc8;hpb=7122b79f53f4501751d884c0bf2e838ab501c4a3;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/input.h b/input.h index 7e1e6aa..aa546c9 100644 --- a/input.h +++ b/input.h @@ -32,6 +32,7 @@ enum sr_bind{ k_srbind_world_left, k_srbind_world_right, k_srbind_home, + k_srbind_lobby, k_srbind_max, }; @@ -125,7 +126,8 @@ static const char *button_display_string( enum sr_bind button ) [k_srbind_replay_play]= controller_glyph( SDL_CONTROLLER_BUTTON_X ), [k_srbind_replay_freecam]=controller_glyph(SDL_CONTROLLER_BUTTON_Y ), [k_srbind_replay_resume]=controller_glyph( SDL_CONTROLLER_BUTTON_A ), - [k_srbind_sit] = controller_glyph( SDL_CONTROLLER_BUTTON_B ) + [k_srbind_sit] = controller_glyph( SDL_CONTROLLER_BUTTON_B ), + [k_srbind_lobby] = controller_glyph( SDL_CONTROLLER_BUTTON_DPAD_LEFT ) }; const char *keyboard_table[ k_srbind_max ] = { @@ -150,7 +152,8 @@ static const char *button_display_string( enum sr_bind button ) [k_srbind_replay_play]= KEYBOARD_GLYPH( "G" ), [k_srbind_replay_freecam] = KEYBOARD_GLYPH( "F" ), [k_srbind_replay_resume]= "\xa1", - [k_srbind_sit] = KEYBOARD_GLYPH( "Z" ) + [k_srbind_sit] = KEYBOARD_GLYPH( "Z" ), + [k_srbind_lobby] = KEYBOARD_GLYPH( "" ) // FIXME: what is tab? }; if( vg_input.display_input_method == k_input_method_controller ) @@ -315,6 +318,7 @@ static void skaterift_preupdate_inputs(void) setbtn( k_srbind_replay_freecam, vg_getkey(SDLK_f) ); setbtn( k_srbind_replay_resume, vg_getkey(SDLK_SPACE) ); setbtn( k_srbind_sit, vg_getkey(SDLK_z) ); + setbtn( k_srbind_lobby, vg_getkey(SDLK_TAB) ); /* axis * --------------------------------------------*/ @@ -376,6 +380,7 @@ static void skaterift_preupdate_inputs(void) setbtn( k_srbind_replay_play, buttons[ SDL_CONTROLLER_BUTTON_X ] ); setbtn( k_srbind_replay_freecam, buttons[ SDL_CONTROLLER_BUTTON_Y ] ); setbtn( k_srbind_sit, buttons[ SDL_CONTROLLER_BUTTON_B ] ); + setbtn( k_srbind_lobby, buttons[ SDL_CONTROLLER_BUTTON_DPAD_LEFT ] ); float *axis = controller->axises; float *steer = srinput.joystick_states[ k_srjoystick_steer ][0],