From 385074d6ae5331e5b150540559adf2c13ca716a6 Mon Sep 17 00:00:00 2001 From: przemek83 <4788832+przemek83@users.noreply.github.com> Date: Fri, 11 Oct 2024 08:51:15 +0200 Subject: [PATCH] Remove some magic numbers. --- src/Status.cpp | 12 ++++++++---- src/Tank.cpp | 5 +++-- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/Status.cpp b/src/Status.cpp index 9879af1..3d2fee3 100644 --- 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 index d069f6d..392ef6b 100644 --- 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 Tank::getNextExpectedPosition() const