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

Merge pull request #1758 from Adriankhl/fix_active_stack_spell_cast

Browse Source 
Deactivate activeStack during spellCast
This commit is contained in:
Ivan Savenko
2023-03-25 01:21:26 +02:00
committed by GitHub
parent 459a6f067b 76a71226a2
commit 61ed22f553
3 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
client/battle/BattleInterface.cpp
View File

@@ -310,6 +310,12 @@ void BattleInterface::spellCast(const BattleSpellCast * sc)
{
windowObject->blockUI(true);
// Disable current active stack duing the cast
// Store the current activeStack to stackToActivate
stacksController->deactivateStack();
CCS->curh->set(Cursor::Combat::BLOCKED);
const SpellID spellID = sc->spellID;
const CSpell * spell = spellID.toSpell();
auto targetedTile = sc->tile;
@@ -551,6 +557,9 @@ void BattleInterface::endAction(const BattleAction* action)
{
const CStack *stack = curInt->cb->battleGetStackByID(action->stackNumber);
// Activate stack from stackToActivate because this might have been temporary disabled, e.g., during spell cast
activateStack();
stacksController->endAction(action);
windowObject->updateQueue();

9
client/battle/BattleStacksController.cpp
View File

@@ -683,6 +683,15 @@ void BattleStacksController::stackActivated(const CStack *stack)
owner.activateStack();
}
void BattleStacksController::deactivateStack()
{
if (!activeStack) {
return;
}
stackToActivate = activeStack;
setActiveStack(nullptr);
}
void BattleStacksController::activateStack()
{
if ( !currentAnimations.empty())

4
client/battle/BattleStacksController.h
View File

@@ -118,7 +118,9 @@ public:
void startAction(const BattleAction* action);
void endAction(const BattleAction* action);
void activateStack(); //sets activeStack to stackToActivate etc. //FIXME: No, it's not clear at all
void deactivateStack(); //copy activeStack to stackToActivate, then set activeStack to nullptr to temporary disable current stack
void activateStack(); //copy stackToActivate to activeStack to enable controls of the stack
void setActiveStack(const CStack *stack);
void setSelectedStack(const CStack *stack);