From 27c488e62f4b0c5bbc1e9bc42b3408bdceb1b75d Mon Sep 17 00:00:00 2001 From: krs Date: Fri, 23 Jun 2023 20:05:15 +0300 Subject: [PATCH] Small changes after review. --- client/battle/BattleFieldController.cpp | 10 +++++----- lib/battle/CUnitState.cpp | 2 +- lib/battle/CUnitState.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/client/battle/BattleFieldController.cpp b/client/battle/BattleFieldController.cpp index 429172c60..be62d1ca8 100644 --- a/client/battle/BattleFieldController.cpp +++ b/client/battle/BattleFieldController.cpp @@ -450,7 +450,7 @@ std::set BattleFieldController::getHighlightedHexesForMovementTarget( std::vector BattleFieldController::getRangeHexes(BattleHex sourceHex, uint8_t distance) { - std::vector rangeHexes; // used for return + std::vector rangeHexes; if (!settings["battle"]["rangeLimitHighlightOnHover"].Bool() && !GH.isKeyboardShiftDown()) return rangeHexes; @@ -468,16 +468,16 @@ std::vector BattleFieldController::getRangeHexes(BattleHex sourceHex, std::vector BattleFieldController::getRangeLimitHexes(BattleHex hoveredHex, std::vector rangeHexes, uint8_t distanceToLimit) { - std::vector limitHexes; // used for return + std::vector rangeLimitHexes; // from range hexes get only the ones at the limit for(auto & hex : rangeHexes) { if(BattleHex::getDistance(hoveredHex, hex) == distanceToLimit) - limitHexes.push_back(hex); + rangeLimitHexes.push_back(hex); } - return limitHexes; + return rangeLimitHexes; } bool BattleFieldController::IsHexInRangeLimit(BattleHex hex, std::vector & rangeLimitHexes, int * hexIndexInRangeLimit) @@ -603,7 +603,7 @@ void BattleFieldController::showHighlightedHexes(Canvas & canvas) calculateRangeLimitAndHighlightImages(rangedFullDamageDistance, rangedFullDamageLimitImages, rangedFullDamageLimitHexes, rangedFullDamageLimitHexesHighligts); // calculate array with highlight images for shooting range limit - auto shootingRangeDistance = hoveredStack->getSootingRangeDistance(); + auto shootingRangeDistance = hoveredStack->getShootingRangeDistance(); calculateRangeLimitAndHighlightImages(shootingRangeDistance, shootingRangeLimitImages, shootingRangeLimitHexes, shootingRangeLimitHexesHighligts); } diff --git a/lib/battle/CUnitState.cpp b/lib/battle/CUnitState.cpp index 0c2ff8abc..f317d429d 100644 --- a/lib/battle/CUnitState.cpp +++ b/lib/battle/CUnitState.cpp @@ -609,7 +609,7 @@ uint8_t CUnitState::getRangedFullDamageDistance() const return rangedFullDamageDistance; } -uint8_t CUnitState::getSootingRangeDistance() const +uint8_t CUnitState::getShootingRangeDistance() const { if(!isShooter()) return 0; diff --git a/lib/battle/CUnitState.h b/lib/battle/CUnitState.h index 36425b42e..e4597b4ad 100644 --- a/lib/battle/CUnitState.h +++ b/lib/battle/CUnitState.h @@ -222,7 +222,7 @@ public: void setPosition(BattleHex hex) override; int32_t getInitiative(int turn = 0) const override; uint8_t getRangedFullDamageDistance() const; - uint8_t getSootingRangeDistance() const; + uint8_t getShootingRangeDistance() const; bool canMove(int turn = 0) const override; bool defended(int turn = 0) const override;