- if(controller->joystick_manager->joysticks.size() > 0) {
- joysticks_available = true;
-
- add_controlfield(Controller::UP, _("Up"));
- add_controlfield(Controller::DOWN, _("Down"));
- add_controlfield(Controller::LEFT, _("Left"));
- 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::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(Controller::CONTROLCOUNT, _("Jump with Up"), controller->joystick_manager->jump_with_up_joy);
- } else {
- add_inactive(-1, _("No Joysticks found"));
- joysticks_available = false;
+
+ add_toggle(MNID_AUTO_JOYSTICK_CFG, _("Manual Joystick Configuration"),
+ !m_input_manager->use_game_controller());
+
+ if (m_input_manager->use_game_controller())
+ {
+ m_joysticks_available = false;
+ }
+ else
+ {
+ if (m_input_manager->joystick_manager->joysticks.size() > 0)
+ {
+ m_joysticks_available = true;
+
+ add_controlfield(Controller::UP, _("Up"));
+ add_controlfield(Controller::DOWN, _("Down"));
+ add_controlfield(Controller::LEFT, _("Left"));
+ 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::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);
+ }
+ else
+ {
+ m_joysticks_available = false;
+
+ add_inactive(-1, _("No Joysticks found"));
+ add_entry(MNID_SCAN_JOYSTICKS, _("Scan for Joysticks"));
+ }