Move reading player input outside Game class.

przemek83 · Oct 6, 2024 · 92ede87 · 92ede87
1 parent 88d9354
commit 92ede87
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/src/Game.cpp b/src/Game.cpp
@@ -12,7 +12,6 @@
 #include "Map.h"
 #include "MapUtils.h"
 #include "PointUtils.h"
-#include "StandardInput.h"
 #include "Tank.h"
 #include "Utils.h"
 
@@ -77,18 +76,16 @@ void Game::movement(Tank& tank, Direction direction)
     }
 }
 
-void Game::control()
+void Game::control(const std::set<InputAction>& actions)
 {
     moveBullets();
 
-    StandardInput input;
     for (auto& tank : tanks_)
     {
         Direction direction{Direction::UP};
         if (tank.isPlayerControlled())
         {
             setPower(tank);
-            const auto actions{input.getGameActions()};
             const auto now{std::chrono::system_clock::now()};
             if ((actions.find(InputAction::FIRE) != actions.end()) &&
                 tank.canFire(now))

diff --git a/src/Game.h b/src/Game.h
@@ -15,7 +15,6 @@ struct Point;
 class Display;
 enum class InputAction : char;
 enum class Level : char;
-class Input;
 
 class Game
 {
@@ -24,7 +23,7 @@ class Game
 
     void init(std::iostream& level);
 
-    void control();
+    void control(const std::set<InputAction>& actions);
 
     bool isGameEnding(Display& display) const;
 

diff --git a/src/main.cpp b/src/main.cpp
@@ -63,7 +63,8 @@ int main()
             if (action == InputAction::TIMER)
             {
                 game.draw(screen);
-                game.control();
+                const std::set<InputAction> actions{input.getGameActions()};
+                game.control(actions);
                 screen.refresh();
             }
         }