diff --git a/desktop_version/src/Game.cpp b/desktop_version/src/Game.cpp index e5945f90..d75aaf8b 100644 --- a/desktop_version/src/Game.cpp +++ b/desktop_version/src/Game.cpp @@ -383,6 +383,32 @@ void Game::init(void) disableaudiopause = false; disabletemporaryaudiopause = true; inputdelay = false; + + setdefaultcontrollerbuttons(); +} + +void Game::setdefaultcontrollerbuttons(void) +{ + if (controllerButton_flip.size() < 1) + { + controllerButton_flip.push_back(SDL_CONTROLLER_BUTTON_A); + } + if (controllerButton_map.size() < 1) + { + controllerButton_map.push_back(SDL_CONTROLLER_BUTTON_Y); + } + if (controllerButton_esc.size() < 1) + { + controllerButton_esc.push_back(SDL_CONTROLLER_BUTTON_B); + } + if (controllerButton_restart.size() < 1) + { + controllerButton_restart.push_back(SDL_CONTROLLER_BUTTON_RIGHTSHOULDER); + } + if (controllerButton_interact.size() < 1) + { + controllerButton_interact.push_back(SDL_CONTROLLER_BUTTON_X); + } } void Game::lifesequence(void) @@ -4593,26 +4619,7 @@ void Game::deserializesettings(tinyxml2::XMLElement* dataNode, struct ScreenSett } - if (controllerButton_flip.size() < 1) - { - controllerButton_flip.push_back(SDL_CONTROLLER_BUTTON_A); - } - if (controllerButton_map.size() < 1) - { - controllerButton_map.push_back(SDL_CONTROLLER_BUTTON_Y); - } - if (controllerButton_esc.size() < 1) - { - controllerButton_esc.push_back(SDL_CONTROLLER_BUTTON_B); - } - if (controllerButton_restart.size() < 1) - { - controllerButton_restart.push_back(SDL_CONTROLLER_BUTTON_RIGHTSHOULDER); - } - if (controllerButton_interact.size() < 1) - { - controllerButton_interact.push_back(SDL_CONTROLLER_BUTTON_X); - } + setdefaultcontrollerbuttons(); } bool Game::savestats(bool sync /*= true*/) diff --git a/desktop_version/src/Game.h b/desktop_version/src/Game.h index 1192b395..12c3b895 100644 --- a/desktop_version/src/Game.h +++ b/desktop_version/src/Game.h @@ -136,6 +136,7 @@ class Game public: void init(void); + void setdefaultcontrollerbuttons(void); int crewrescued(void);