Add keyboard control

SAE-Institute-Geneva · Jul 16, 2021 · b094158 · b094158
1 parent f52e016
commit b094158
Show file tree

Hide file tree

Showing 3 changed files with 123 additions and 68 deletions.
diff --git a/common/aer_lib/src/managers/game_manager.cpp b/common/aer_lib/src/managers/game_manager.cpp
@@ -288,7 +288,17 @@ namespace neko::aer
             endGameText[i].SetEnable(true);
             endGameText[i].SetText(std::to_string(i + 1) + positionsText[i] + ": Player " + std::to_string(victoryDatas[i].index + 1) + " (Time: " + fmt::format("{:.2f}", victoryDatas[i].time) + ")");
         }
-        if (endedGame && (time.count() > 30.0f || sdl::InputLocator::get().GetControllerButtonState(sdl::InputLocator::get().GetControllerIdVector()[0], sdl::ControllerButtonType::BUTTON_A) == sdl::ButtonState::DOWN))
+        auto& inputLocator = sdl::InputLocator::get();
+        bool buttonPressed = false;
+        if (!inputLocator.GetControllerIdVector().empty())
+        {
+            sdl::JoyPlayerId joyMainPlayerId = inputLocator.GetControllerIdVector()[0];
+            buttonPressed = inputLocator.GetControllerButtonState(joyMainPlayerId, sdl::ControllerButtonType::BUTTON_A) == sdl::ButtonState::DOWN;
+        }
+        else {
+            buttonPressed = inputLocator.GetKeyState(sdl::KeyCodeType::SPACE) == sdl::ButtonState::DOWN;
+        }
+        if (endedGame && (time.count() > 30.0f || buttonPressed))
         {
             endedGame = false;
             GoBackToMenu();