- refactor game over, so that it also uses the text from the game input and also is specific to the single player, since multiplayer game over has to be handled different

- also use this for the replay input

Author: Totto16

src/scenes/game_over/meson.build

@@ -1,7 +1,6 @@
 graphics_src_files += files('scene.cpp', 'scene.hpp', 'scene_id.hpp')
 
 subdir('about_page')
-subdir('game_over')
 subdir('main_menu')
 subdir('multiplayer_menu')
 subdir('play_select_menu')

src/scenes/meson.build

@@ -1,4 +1,6 @@
 #include "replay_game.hpp"
+#include "../single_player_game/game_over.hpp"
+#include "../single_player_game/pause.hpp"
 #include "helper/music_utils.hpp"
 #include "manager/music_manager.hpp"
 #include "scenes/scene.hpp"
@@ -75,9 +77,14 @@ namespace scenes {
         }
 
         if (all_games_finished) {
+            //TODOO(Totto): the game input we use here for the game over is not guarantteed to work, better wul dbe to get one for this system at the tart of this scene!
             return UpdateResult{
                 SceneUpdate::StopUpdating,
-                Scene::Push{ SceneId::GameOver, ui::FullScreenLayout{ m_service_provider->window() } }
+                Scene::RawPush{ "GameOver",
+                               std::make_unique<scenes::SinglePlayerGameOver>(
+                                        m_service_provider, ui::FullScreenLayout{ m_service_provider->window() },
+                               m_games.at(0)->game_input()
+                                ) }
             };
         }
 
@@ -89,11 +96,15 @@ namespace scenes {
             }
 
             switch (next_scene) {
-                    /*    case NextScene::Pause:
+                case NextScene::Pause:
+                    //TODO(Totto): the game input we use here for the Pauseis not guarantteed to work, better wul dbe to get one for this system at the tart of this scene!
                     return UpdateResult{
                         SceneUpdate::StopUpdating,
-                        Scene::Push{ SceneId::Pause, ui::FullScreenLayout{ m_service_provider->window() } }
-                    }; */
+                        Scene::RawPush{ "Pause", std::make_unique<scenes::SinglePlayerPause>(
+                                                         m_service_provider, ui::FullScreenLayout{ m_service_provider->window() },
+                                       m_games.at(0)->game_input()
+                                                 ) }
+                    };
                 case NextScene::Settings:
                     return UpdateResult{
                         SceneUpdate::StopUpdating,

src/scenes/replay_game/replay_game.cpp

@@ -1,6 +1,5 @@
 #include "scenes/scene.hpp"
 #include "about_page/about_page.hpp"
-#include "game_over/game_over.hpp"
 #include "main_menu/main_menu.hpp"
 #include "multiplayer_menu/multiplayer_menu.hpp"
 #include "play_select_menu/play_select_menu.hpp"
@@ -26,8 +25,6 @@ namespace scenes {
                 return std::make_unique<MainMenu>(&service_provider, layout);
             case SceneId::SinglePlayerGame:
                 return std::make_unique<SinglePlayerGame>(&service_provider, layout);
-            case SceneId::GameOver:
-                return std::make_unique<GameOver>(&service_provider, layout);
             case SceneId::SettingsMenu:
                 return std::make_unique<SettingsMenu>(&service_provider, layout);
             case SceneId::AboutPage:

src/scenes/scene.cpp

@@ -6,7 +6,6 @@ enum class SceneId : u8 {
     AboutPage,
     AchievementsPage,
     AIMultiPlayerGame,
-    GameOver,
     LocalMultiPlayerGame,
     MainMenu,
     MultiPlayerModeSelectMenu,

src/scenes/scene_id.hpp

@@ -10,13 +10,13 @@
 
 namespace scenes {
 
-    GameOver::GameOver(ServiceProvider* service_provider, const ui::Layout& layout)
+    SinglePlayerGameOver::SinglePlayerGameOver(ServiceProvider* service_provider, const ui::Layout& layout,  const std::shared_ptr<input::GameInput>& game_input)
         : Scene{ service_provider, layout },
           m_text{
             service_provider,
               fmt::format(
                       "Game Over, Press {} to continue",
-                     service_provider->input_manager().get_primary_input()->describe_navigation_event(input::NavigationEvent::BACK)
+                   game_input->underlying_input()->describe_navigation_event(input::NavigationEvent::BACK)
               ),
                service_provider->font_manager().get(FontId::Default),
               Color::white(),
@@ -26,15 +26,15 @@ namespace scenes {
                 ui::Alignment{ ui::AlignmentHorizontal::Middle, ui::AlignmentVertical::Center },
                 layout,
                 true
-          } {
+          } ,m_game_input{game_input}{
         service_provider->music_manager()
                 .load_and_play_music(
                         utils::get_assets_folder() / "music" / utils::get_supported_music_extension("05. Results")
                 )
                 .and_then(utils::log_error);
     }
 
-    [[nodiscard]] Scene::UpdateResult GameOver::update() {
+    [[nodiscard]] Scene::UpdateResult SinglePlayerGameOver::update() {
         if (m_should_exit) {
             return UpdateResult{
                 SceneUpdate::StopUpdating,
@@ -44,12 +44,15 @@ namespace scenes {
         return UpdateResult{ SceneUpdate::StopUpdating, helper::nullopt };
     }
 
-    void GameOver::render(const ServiceProvider& service_provider) {
+    void SinglePlayerGameOver::render(const ServiceProvider& service_provider) {
         service_provider.renderer().draw_rect_filled(get_layout().get_rect(), Color::black(180));
         m_text.render(service_provider);
     }
 
-    bool GameOver::handle_event(const std::shared_ptr<input::InputManager>& input_manager, const SDL_Event& event) {
+    bool SinglePlayerGameOver::handle_event(
+            const std::shared_ptr<input::InputManager>& input_manager,
+            const SDL_Event& event
+    ) {
 
         const auto navigation_event = input_manager->get_navigation_event(event);
 

src/scenes/game_over/game_over.cpp renamed to src/scenes/single_player_game/game_over.cpp

@@ -5,13 +5,18 @@
 
 namespace scenes {
 
-    struct GameOver : public Scene {
+    struct SinglePlayerGameOver : public Scene {
     private:
         bool m_should_exit{ false };
         ui::Label m_text;
+        std::shared_ptr<input::GameInput> m_game_input;
 
     public:
-        explicit GameOver(ServiceProvider* service_provider, const ui::Layout& layout);
+        explicit SinglePlayerGameOver(
+                ServiceProvider* service_provider,
+                const ui::Layout& layout,
+                const std::shared_ptr<input::GameInput>& game_input
+        );
 
         [[nodiscard]] UpdateResult update() override;
 

src/scenes/game_over/game_over.hpp renamed to src/scenes/single_player_game/game_over.hpp

@@ -1,6 +1,8 @@
 graphics_src_files += files(
     'pause.cpp',
     'pause.hpp',
+    'game_over.cpp',
+    'game_over.hpp',
     'single_player_game.cpp',
     'single_player_game.hpp',
 )

src/scenes/single_player_game/meson.build

@@ -9,6 +9,7 @@
 #include "manager/music_manager.hpp"
 #include "scenes/scene.hpp"
 #include "scenes/settings_menu/settings_menu.hpp"
+#include "scenes/single_player_game/game_over.hpp"
 #include "scenes/single_player_game/pause.hpp"
 
 namespace scenes {
@@ -64,7 +65,11 @@ namespace scenes {
         if (m_game->is_game_finished()) {
             return UpdateResult{
                 SceneUpdate::StopUpdating,
-                Scene::Push{ SceneId::GameOver, ui::FullScreenLayout{ m_service_provider->window() } }
+                Scene::RawPush{ "GameOver",
+                               std::make_unique<scenes::SinglePlayerGameOver>(
+                                        m_service_provider, ui::FullScreenLayout{ m_service_provider->window() },
+                               m_game->game_input()
+                                ) }
             };
         }