Remove misleading Game::setPower method. Move method body into place …

…of use.
przemek83 · Oct 9, 2024 · f8c94e1 · f8c94e1
1 parent f32bf0d
commit f8c94e1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/src/Game.cpp b/src/Game.cpp
@@ -87,7 +87,10 @@ void Game::movePlayerTank(const std::set<InputAction>& actions)
 {
     Tank& tank{getPlayerTank()};
 
-    setPower(tank);
+    if (auto [takenPowerUp, powerUpType]{map_.takePowerUp(tank.getCenter())};
+        takenPowerUp)
+        tank.applyPowerUp(powerUpType);
+
     if (const auto now{std::chrono::system_clock::now()};
         containsAction(actions, InputAction::FIRE) && tank.canFire(now))
         bullets_.emplace_back(tank.fire(now));
@@ -215,13 +218,6 @@ void Game::draw(const Display& display)
     status_.update(getPlayerTank().getStats(), display);
 }
 
-void Game::setPower(Tank& tank)
-{
-    if (auto [takenPowerUp, powerUp]{map_.takePowerUp(tank.getCenter())};
-        takenPowerUp)
-        tank.applyPowerUp(powerUp);
-}
-
 bool Game::containsAction(const std::set<InputAction>& actions,
                           InputAction action)
 {

diff --git a/src/Game.h b/src/Game.h
@@ -38,7 +38,6 @@ class Game
     void drawTanks(const Display& display) const;
     void drawEndOfGame(Display& display, const std::string& text) const;
     void drawBullets(const Display& display) const;
-    void setPower(Tank& tank);
 
     static std::pair<bool, Direction> inputActionsToDirection(
         const std::set<InputAction>& actions);