games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-13 19:54:17 +02:00
Code Issues Releases Activity

Small changes after review.

Browse Source
This commit is contained in:
krs
2023-06-23 20:05:15 +03:00
parent afe0146021
commit 27c488e62f
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
client/battle/BattleFieldController.cpp
View File

@@ -450,7 +450,7 @@ std::set<BattleHex> BattleFieldController::getHighlightedHexesForMovementTarget(
std::vector<BattleHex> BattleFieldController::getRangeHexes(BattleHex sourceHex, uint8_t distance) std::vector<BattleHex> BattleFieldController::getRangeHexes(BattleHex sourceHex, uint8_t distance)
{ {
std::vector<BattleHex> rangeHexes; // used for return std::vector<BattleHex> rangeHexes;
if (!settings["battle"]["rangeLimitHighlightOnHover"].Bool() && !GH.isKeyboardShiftDown()) if (!settings["battle"]["rangeLimitHighlightOnHover"].Bool() && !GH.isKeyboardShiftDown())
return rangeHexes; return rangeHexes;
@@ -468,16 +468,16 @@ std::vector<BattleHex> BattleFieldController::getRangeHexes(BattleHex sourceHex,
std::vector<BattleHex> BattleFieldController::getRangeLimitHexes(BattleHex hoveredHex, std::vector<BattleHex> rangeHexes, uint8_t distanceToLimit) std::vector<BattleHex> BattleFieldController::getRangeLimitHexes(BattleHex hoveredHex, std::vector<BattleHex> rangeHexes, uint8_t distanceToLimit)
{ {
std::vector<BattleHex> limitHexes; // used for return std::vector<BattleHex> rangeLimitHexes;
// from range hexes get only the ones at the limit // from range hexes get only the ones at the limit
for(auto & hex : rangeHexes) for(auto & hex : rangeHexes)
{ {
if(BattleHex::getDistance(hoveredHex, hex) == distanceToLimit) 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<BattleHex> & rangeLimitHexes, int * hexIndexInRangeLimit) bool BattleFieldController::IsHexInRangeLimit(BattleHex hex, std::vector<BattleHex> & rangeLimitHexes, int * hexIndexInRangeLimit)
@@ -603,7 +603,7 @@ void BattleFieldController::showHighlightedHexes(Canvas & canvas)
calculateRangeLimitAndHighlightImages(rangedFullDamageDistance, rangedFullDamageLimitImages, rangedFullDamageLimitHexes, rangedFullDamageLimitHexesHighligts); calculateRangeLimitAndHighlightImages(rangedFullDamageDistance, rangedFullDamageLimitImages, rangedFullDamageLimitHexes, rangedFullDamageLimitHexesHighligts);
// calculate array with highlight images for shooting range limit // calculate array with highlight images for shooting range limit
auto shootingRangeDistance = hoveredStack->getSootingRangeDistance(); auto shootingRangeDistance = hoveredStack->getShootingRangeDistance();
calculateRangeLimitAndHighlightImages(shootingRangeDistance, shootingRangeLimitImages, shootingRangeLimitHexes, shootingRangeLimitHexesHighligts); calculateRangeLimitAndHighlightImages(shootingRangeDistance, shootingRangeLimitImages, shootingRangeLimitHexes, shootingRangeLimitHexesHighligts);
} }

2
lib/battle/CUnitState.cpp
View File

@@ -609,7 +609,7 @@ uint8_t CUnitState::getRangedFullDamageDistance() const
return rangedFullDamageDistance; return rangedFullDamageDistance;
} }
uint8_t CUnitState::getSootingRangeDistance() const uint8_t CUnitState::getShootingRangeDistance() const
{ {
if(!isShooter()) if(!isShooter())
return 0; return 0;

2
lib/battle/CUnitState.h
View File

@@ -222,7 +222,7 @@ public:
void setPosition(BattleHex hex) override; void setPosition(BattleHex hex) override;
int32_t getInitiative(int turn = 0) const override; int32_t getInitiative(int turn = 0) const override;
uint8_t getRangedFullDamageDistance() const; uint8_t getRangedFullDamageDistance() const;
uint8_t getSootingRangeDistance() const; uint8_t getShootingRangeDistance() const;
bool canMove(int turn = 0) const override; bool canMove(int turn = 0) const override;
bool defended(int turn = 0) const override; bool defended(int turn = 0) const override;