#include <sstream>
#include "control/joystick_manager.hpp"
+#include "supertux/gameconfig.hpp"
#include "util/gettext.hpp"
namespace {
add_controlfield(Controller::RIGHT, _("Right"));
add_controlfield(Controller::JUMP, _("Jump"));
add_controlfield(Controller::ACTION, _("Action"));
- add_controlfield(Controller::PAUSE_MENU, _("Pause/Menu"));
+ add_controlfield(Controller::START, _("Pause/Menu"));
add_controlfield(Controller::PEEK_LEFT, _("Peek Left"));
add_controlfield(Controller::PEEK_RIGHT, _("Peek Right"));
add_controlfield(Controller::PEEK_UP, _("Peek Up"));
add_controlfield(Controller::PEEK_DOWN, _("Peek Down"));
-
- add_toggle(MNID_JUMP_WITH_UP, _("Jump with Up"), m_input_manager.joystick_manager->jump_with_up_joy);
+ 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
{
}
else if (item->id == MNID_JUMP_WITH_UP)
{
- m_input_manager.joystick_manager->jump_with_up_joy = item->toggled;
+ g_config->joystick_config.jump_with_up_joy = item->toggled;
}
else if (item->id == MNID_AUTO_JOYSTICK_CFG)
{
void
JoystickMenu::refresh_menu_item(Controller::Control id)
{
- int button = m_input_manager.joystick_manager->reversemap_joybutton(id);
- int axis = m_input_manager.joystick_manager->reversemap_joyaxis(id);
- int hat_dir = m_input_manager.joystick_manager->reversemap_joyhat(id);
+ int button = g_config->joystick_config.reversemap_joybutton(id);
+ int axis = g_config->joystick_config.reversemap_joyaxis(id);
+ int hat_dir = g_config->joystick_config.reversemap_joyhat(id);
if (button != -1)
{
refresh_menu_item(Controller::JUMP);
refresh_menu_item(Controller::ACTION);
- refresh_menu_item(Controller::PAUSE_MENU);
+ refresh_menu_item(Controller::START);
refresh_menu_item(Controller::PEEK_LEFT);
refresh_menu_item(Controller::PEEK_RIGHT);
refresh_menu_item(Controller::PEEK_UP);
refresh_menu_item(Controller::PEEK_DOWN);
+
+ if (g_config->developer_mode || g_config->console_enabled) {
+ refresh_menu_item(Controller::CONSOLE);
+ }
+ if (g_config->developer_mode) {
+ refresh_menu_item(Controller::CHEAT_MENU);
+ }
}
}