games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-27 22:49:25 +02:00
Code Issues Releases Activity

Mostly finished refactoring of BattleActionsController

Browse Source 
TODO: test actions
TODO: test casters
TODO: fix random casters
This commit is contained in:
Ivan Savenko
2023-01-21 19:42:44 +02:00
parent a2035122e1
commit 55a58596bc
5 changed files with 569 additions and 584 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
client/battle/BattleFieldController.cpp
View File

@@ -109,7 +109,7 @@ void BattleFieldController::mouseMoved(const SDL_MouseMotionEvent &event)
{
BattleHex selectedHex = getHoveredHex();
owner.actionsController->handleHex(selectedHex, MOVE);
owner.actionsController->onHexHovered(selectedHex);
}
@@ -237,12 +237,12 @@ std::set<BattleHex> BattleFieldController::getHighlightedHexesSpellRange()
if(owner.actionsController->spellcastingModeActive())//hero casts spell
{
spell = owner.actionsController->selectedSpell().toSpell();
spell = owner.actionsController->getHeroSpellToCast();
caster = owner.getActiveHero();
}
else if(owner.stacksController->activeStackSpellToCast() != SpellID::NONE)//stack casts spell
else if(owner.actionsController->getStackSpellToCast(hoveredHex) != nullptr)//stack casts spell
{
spell = SpellID(owner.stacksController->activeStackSpellToCast()).toSpell();
spell = owner.actionsController->getStackSpellToCast(hoveredHex);
caster = owner.stacksController->getActiveStack();
mode = spells::Mode::CREATURE_ACTIVE;
}
@@ -520,7 +520,7 @@ BattleHex BattleFieldController::fromWhichHexAttack(BattleHex attackTarget)
}
default:
assert(0);
return attackTarget.cloneInDirection(BattleHex::LEFT);
return BattleHex::INVALID;
}
}
}