From aba5840a6fb5d945c5f8e6eef1eb57644cd59bf5 Mon Sep 17 00:00:00 2001 From: krs Date: Thu, 6 Apr 2023 00:12:42 +0300 Subject: [PATCH] Removed Max Movement Highlight stubs --- client/battle/BattleFieldController.cpp | 29 ------------------------- client/battle/BattleFieldController.h | 1 - 2 files changed, 30 deletions(-) diff --git a/client/battle/BattleFieldController.cpp b/client/battle/BattleFieldController.cpp index f7ad4e2d5..be67b14ea 100644 --- a/client/battle/BattleFieldController.cpp +++ b/client/battle/BattleFieldController.cpp @@ -259,31 +259,6 @@ std::set BattleFieldController::getMovementRangeForHoveredStack() return result; } -std::set BattleFieldController::STUB_getMaxMovementRangeForHoveredStack() -{ - std::set result; - - if (!owner.stacksController->getActiveStack()) - return result; - - if (!settings["battle"]["movementHighlightOnHover"].Bool()) - return result; - - auto hoveredHex = getHoveredHex(); - - // add max movement hexes for stack under mouse - const CStack * const hoveredStack = owner.curInt->cb->battleGetStackByPos(hoveredHex, true); - if(hoveredStack) - { - auto hex = BattleHex(10, 5); - - result.insert(hex); - } - - return result; - -} - std::set BattleFieldController::getHighlightedHexesForSpellRange() { std::set result; @@ -361,7 +336,6 @@ std::set BattleFieldController::getHighlightedHexesMovementTarget() void BattleFieldController::showHighlightedHexes(Canvas & canvas) { std::set hoveredStackMovementRangeHexes = getMovementRangeForHoveredStack(); - std::set hoveredStackMaxMovementHexes = STUB_getMaxMovementRangeForHoveredStack(); std::set hoveredSpellHexes = getHighlightedHexesForSpellRange(); std::set hoveredMoveHexes = getHighlightedHexesMovementTarget(); @@ -373,7 +347,6 @@ void BattleFieldController::showHighlightedHexes(Canvas & canvas) for(int hex = 0; hex < GameConstants::BFIELD_SIZE; ++hex) { bool stackMovement = hoveredStackMovementRangeHexes.count(hex); - bool stackMaxMovement = hoveredStackMaxMovementHexes.count(hex); bool mouse = hoveredMouseHexes.count(hex); if(stackMovement && mouse) // area where hovered stackMovement can move shown with highlight. Because also affected by mouse cursor, shade as well @@ -389,8 +362,6 @@ void BattleFieldController::showHighlightedHexes(Canvas & canvas) { showHighlightedHex(canvas, cellUnitMovementHighlight, hex, false); } - if(stackMaxMovement) - showHighlightedHex(canvas, cellUnitMaxMovementHighlight, hex, false); } } diff --git a/client/battle/BattleFieldController.h b/client/battle/BattleFieldController.h index 94ed04860..1697e75e5 100644 --- a/client/battle/BattleFieldController.h +++ b/client/battle/BattleFieldController.h @@ -52,7 +52,6 @@ class BattleFieldController : public CIntObject std::set getHighlightedHexesForActiveStack(); std::set getMovementRangeForHoveredStack(); - std::set STUB_getMaxMovementRangeForHoveredStack(); std::set getHighlightedHexesForSpellRange(); std::set getHighlightedHexesMovementTarget();