Skip to content

Commit

Permalink
Added cheat menu keyboard and joystick bindings, only visible in deve…
Browse files Browse the repository at this point in the history
…loper mode
  • Loading branch information
Grumbel committed Aug 19, 2014
1 parent 002fa22 commit cd105dd
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/control/keyboard_config.cpp
Expand Up @@ -41,7 +41,7 @@ KeyboardConfig::KeyboardConfig() :
keymap[SDLK_PAGEDOWN] = Controller::PEEK_RIGHT;
keymap[SDLK_HOME] = Controller::PEEK_UP;
keymap[SDLK_END] = Controller::PEEK_DOWN;
keymap[SDLK_TAB] = Controller::CHEAT_MENU;
keymap[SDLK_F1] = Controller::CHEAT_MENU;
}

void
Expand Down
8 changes: 7 additions & 1 deletion src/supertux/menu/joystick_menu.cpp
Expand Up @@ -75,7 +75,12 @@ JoystickMenu::recreate_menu()
add_controlfield(Controller::PEEK_RIGHT, _("Peek Right"));
add_controlfield(Controller::PEEK_UP, _("Peek Up"));
add_controlfield(Controller::PEEK_DOWN, _("Peek Down"));

if (g_config->developer_mode || g_config->console_enabled) {
add_controlfield(Controller::CONSOLE, _("Console"));
}
if (g_config->developer_mode) {
add_controlfield(Controller::CHEAT_MENU, _("Cheat Menu"));
}
add_toggle(MNID_JUMP_WITH_UP, _("Jump with Up"), g_config->joystick_config.jump_with_up_joy);
}
else
Expand Down Expand Up @@ -219,6 +224,7 @@ JoystickMenu::refresh()
refresh_menu_item(Controller::PEEK_RIGHT);
refresh_menu_item(Controller::PEEK_UP);
refresh_menu_item(Controller::PEEK_DOWN);
refresh_menu_item(Controller::CHEAT_MENU);
}
}

Expand Down
9 changes: 7 additions & 2 deletions src/supertux/menu/keyboard_menu.cpp
Expand Up @@ -37,9 +37,12 @@ KeyboardMenu::KeyboardMenu(InputManager& input_manager) :
add_controlfield(Controller::PEEK_RIGHT, _("Peek Right"));
add_controlfield(Controller::PEEK_UP, _("Peek Up"));
add_controlfield(Controller::PEEK_DOWN, _("Peek Down"));
if (g_config->console_enabled) {
if (g_config->developer_mode || g_config->console_enabled) {
add_controlfield(Controller::CONSOLE, _("Console"));
}
if (g_config->developer_mode) {
add_controlfield(Controller::CHEAT_MENU, _("Cheat Menu"));
}
add_toggle(Controller::CONTROLCOUNT, _("Jump with Up"), g_config->keyboard_config.jump_with_up_kbd);
add_hl();
add_back(_("Back"));
Expand Down Expand Up @@ -84,7 +87,7 @@ KeyboardMenu::get_key_name(SDL_Keycode key)
case SDLK_LGUI:
return _("Left Command");
default:
return SDL_GetKeyName((SDL_Keycode) key);
return SDL_GetKeyName(static_cast<SDL_Keycode>(key));
}
}

Expand Down Expand Up @@ -124,6 +127,8 @@ KeyboardMenu::refresh()
.change_input(get_key_name(kbd_cfg.reversemap_key(Controller::PEEK_UP)));
get_item_by_id((int) Controller::PEEK_DOWN)
.change_input(get_key_name(kbd_cfg.reversemap_key(Controller::PEEK_DOWN)));
get_item_by_id((int) Controller::CHEAT_MENU)
.change_input(get_key_name(kbd_cfg.reversemap_key(Controller::CHEAT_MENU)));

if (g_config->console_enabled)
{
Expand Down

0 comments on commit cd105dd

Please sign in to comment.