Rework Game initialization.

przemek83 · Oct 7, 2024 · 31a14a2 · 31a14a2
1 parent 8e1606a
commit 31a14a2
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 14 deletions.
diff --git a/src/Game.cpp b/src/Game.cpp
@@ -15,15 +15,14 @@
 #include "Tank.h"
 #include "Utils.h"
 
-Game::Game()
+Game::Game(std::list<Tank>& tanks, Map& map)
     : status_{{Config::getInstance().getBoardWidth(), 0}},
       randomGenerator_{Config::getRandomSeed()},
-      map_{Config::getInstance().getTileCount()}
+      tanks_{tanks},
+      map_{map}
 {
 }
 
-void Game::init(std::iostream& level) { tanks_ = map_.loadMap(level); }
-
 std::pair<bool, Direction> Game::inputActionsToDirection(
     const std::set<InputAction>& actions)
 {

diff --git a/src/Game.h b/src/Game.h
@@ -19,9 +19,7 @@ enum class Level : char;
 class Game
 {
 public:
-    Game();
-
-    void init(std::iostream& level);
+    Game(std::list<Tank>& tanks, Map& map);
 
     void moveBullets();
 
@@ -53,7 +51,7 @@ class Game
     std::uniform_int_distribution<> distribution_{
         std::uniform_int_distribution<>(0, 7)};
 
-    std::list<Tank> tanks_;
-    Map map_;
+    std::list<Tank>& tanks_;
+    Map& map_;
     std::list<Bullet> bullets_;
 };
diff --git a/src/main.cpp b/src/main.cpp
@@ -1,6 +1,7 @@
 #include <cstdlib>
 #include <fstream>
 
+#include "Config.h"
 #include "Game.h"
 #include "InputAction.h"
 #include "Menu.h"
@@ -69,13 +70,16 @@ int main()
         if (choice == UserChoice::EXIT)
             return EXIT_SUCCESS;
 
-        Game game;
-        const Level level{menu.choiceToLevel(choice)};
-        if (auto [ok, levelContent]{Resources::getLevel(level)}; ok)
-            game.init(levelContent);
-        else
+        auto [ok, level]{Resources::getLevel(menu.choiceToLevel(choice))};
+        if (!ok)
             return EXIT_FAILURE;
 
+        Map map{Config::getInstance().getTileCount()};
+        std::list<Tank> tanks{map.loadMap(level)};
+
+        Game game{tanks, map};
         exit = play(std::move(game), screen, input);
     }
+
+    return EXIT_SUCCESS;
 }