Remove some magic numbers.

przemek83 · Oct 11, 2024 · 385074d · 385074d
1 parent fef8370
commit 385074d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/src/Status.cpp b/src/Status.cpp
@@ -23,14 +23,18 @@ void Status::update(TankStats newStats, const Display& display)
 void Status::draw(const Display& display) const
 {
     const int spacer{getHeight() / 5};
-    display.drawTextWithBackground(getCenter().x_, spacer * 1,
+    int verticalPosition{spacer};
+    display.drawTextWithBackground(getCenter().x_, verticalPosition,
                                    "Lives: " + std::to_string(stats_.lives_));
-    display.drawTextWithBackground(getCenter().x_, spacer * 2,
+    verticalPosition += spacer;
+    display.drawTextWithBackground(getCenter().x_, verticalPosition,
                                    "Shield: " + std::to_string(stats_.shield_));
-    display.drawTextWithBackground(getCenter().x_, spacer * 3,
+    verticalPosition += spacer;
+    display.drawTextWithBackground(getCenter().x_, verticalPosition,
                                    "Speed: " + std::to_string(stats_.speed_));
+    verticalPosition += spacer;
     display.drawTextWithBackground(
-        getCenter().x_, spacer * 4,
+        getCenter().x_, verticalPosition,
         "Attack: " + std::to_string(stats_.attackPower_));
 }
 

diff --git a/src/Tank.cpp b/src/Tank.cpp
@@ -121,8 +121,9 @@ TankStats Tank::getStats() const { return stats_; }
 Bullet Tank::fire(TimePoint currentTime)
 {
     lastFire_ = currentTime;
-    return {getCenter(), stats_.speed_ + 2, isPlayerControlled(),
-            stats_.attackPower_, getDirection()};
+    const int bulletSpeedIncrease{2};
+    return {getCenter(), stats_.speed_ + bulletSpeedIncrease,
+            isPlayerControlled(), stats_.attackPower_, getDirection()};
 }
 
 std::pair<int, int> Tank::getNextExpectedPosition() const