- if(controller->joysticks.size() > 0) {
- 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->jump_with_up_joy);
- } else {
- add_inactive(-1, _("No Joysticks found"));
- }
- add_inactive(-1,"");
- add_entry(SCAN_JOYSTICKS, _("Scan for Joysticks"));
- //Show Joysticks currently activated: //edit by giby
- SDL_Joystick *joy;
- if (SDL_NumJoysticks() > 0) {
- joy = SDL_JoystickOpen(0);
+
+ add_toggle(MNID_AUTO_JOYSTICK_CFG, _("Manual Configuration"),
+ !m_input_manager->use_game_controller())
+ ->set_help(_("Use manual configuration instead of SDL2's automatic GameController support"));
+
+ if (m_input_manager->use_game_controller())
+ {
+ m_joysticks_available = false;