Skip to content

Commit

Permalink
rename native buttons -> console buttons
Browse files Browse the repository at this point in the history
  • Loading branch information
valentecaio committed Aug 3, 2020
1 parent 0a2ec56 commit 583b9e2
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions src/port/sdl/frontend.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,7 @@ static int gui_SPUSettings();
static int gui_InputSettings();
static int gui_Cheats();
static int gui_Quit();
static int gui_input_native();
static int gui_input_console();
static int gui_input_hotkeys();
static int gui_input_js(uint8_t js_id);
static int gui_input_js1() { return gui_input_js(1); }
Expand Down Expand Up @@ -2022,7 +2022,7 @@ static void map_all_buttons_hint() {

// input menu
static MENUITEM gui_InputItems[] = {
{(char *)"Native buttons", &gui_input_native, NULL, NULL, NULL},
{(char *)"Console buttons", &gui_input_console, NULL, NULL, NULL},
{(char *)"USB gamepad 1", &gui_input_js1, NULL, NULL, NULL},
{(char *)"USB gamepad 2", &gui_input_js2, NULL, NULL, NULL},
{(char *)"Profiles", &gui_profiles, NULL, NULL, NULL},
Expand All @@ -2032,17 +2032,17 @@ static MENUITEM gui_InputItems[] = {
#define SET_INPUT_SIZE ((sizeof(gui_InputItems) / sizeof(MENUITEM)) - 1)
static MENU gui_InputMenu = { SET_INPUT_SIZE, 0, 102, 120, (MENUITEM *)&gui_InputItems };

// native buttons menu
static MENUITEM gui_input_NativeItems[] = {
// console buttons menu
static MENUITEM gui_input_ConsoleItems[] = {
{(char *)"Player ", NULL, &js_player_change, &js_player_show, NULL},
{(char *)"Button profile ", &gui_profile_edit_from_js, &js_profile_change, &js_profile_show, &js_profile_hint},
{(char *)"Map L-stick to D-pad ", NULL, &AnalogArrow_alter, &AnalogArrow_show, &AnalogArrow_hint},
{(char *)"Analog Mode ", NULL, &Analog_Mode_alter, &Analog_Mode_show, &Analog_Mode_hint},
{(char *)"Analogs deadzone ", NULL, &js_deadzone_change, &js_deadzone_show, NULL},
{0}
};
#define SET_INPUT_NATIVE_SIZE ((sizeof(gui_input_NativeItems) / sizeof(MENUITEM)) - 1)
static MENU gui_input_NativeMenu = { SET_INPUT_NATIVE_SIZE, 0, 56, 120, (MENUITEM *)&gui_input_NativeItems };
#define SET_INPUT_NATIVE_SIZE ((sizeof(gui_input_ConsoleItems) / sizeof(MENUITEM)) - 1)
static MENU gui_input_ConsoleMenu = { SET_INPUT_NATIVE_SIZE, 0, 56, 120, (MENUITEM *)&gui_input_ConsoleItems };

// hotkeys menu
static MENUITEM gui_input_HotkeysItems[] = {
Expand Down Expand Up @@ -2139,9 +2139,9 @@ static MENUITEM gui_profile_editItems[] = {
static MENU gui_profile_editMenu = { SET_PROFILE_EDIT_SIZE, 0, 102, 92, (MENUITEM *)&gui_profile_editItems };


static int gui_input_native() {
static int gui_input_console() {
js_being_edited = 0;
gui_RunMenu(&gui_input_NativeMenu);
gui_RunMenu(&gui_input_ConsoleMenu);
return 0;
}

Expand Down

0 comments on commit 583b9e2

Please sign in to comment.