mirror of
https://github.com/vcmi/vcmi.git
synced 2024-12-24 22:14:36 +02:00
Fixed ending of battles due to retreat/surrender
This commit is contained in:
parent
a852236602
commit
81242d3500
@ -325,7 +325,7 @@ void BattleInterface::battleFinished(const BattleResult& br, QueryID queryID)
|
||||
curInt->cb->selectionMade(selection, queryID);
|
||||
};
|
||||
GH.windows().pushWindow(wnd);
|
||||
|
||||
|
||||
curInt->waitWhileDialog(); // Avoid freeze when AI end turn after battle. Check bug #1897
|
||||
CPlayerInterface::battleInt = nullptr;
|
||||
}
|
||||
@ -601,28 +601,13 @@ void BattleInterface::startAction(const BattleAction & action)
|
||||
return;
|
||||
}
|
||||
|
||||
const CStack *stack = curInt->cb->battleGetStackByID(action.stackNumber);
|
||||
|
||||
if (stack)
|
||||
{
|
||||
windowObject->updateQueue();
|
||||
}
|
||||
else
|
||||
{
|
||||
assert(action.actionType == EActionType::HERO_SPELL); //only cast spell is valid action without acting stack number
|
||||
}
|
||||
|
||||
stacksController->startAction(action);
|
||||
|
||||
if(action.actionType == EActionType::HERO_SPELL) //when hero casts spell
|
||||
if (!action.isUnitAction())
|
||||
return;
|
||||
|
||||
if (!stack)
|
||||
{
|
||||
logGlobal->error("Something wrong with stackNumber in actionStarted. Stack number: %d", action.stackNumber);
|
||||
return;
|
||||
}
|
||||
|
||||
assert(curInt->cb->battleGetStackByID(action.stackNumber));
|
||||
windowObject->updateQueue();
|
||||
effectsController->startAction(action);
|
||||
}
|
||||
|
||||
|
@ -205,7 +205,6 @@ bool BattleAction::isUnitAction() const
|
||||
EActionType::BAD_MORALE,
|
||||
EActionType::STACK_HEAL
|
||||
};
|
||||
|
||||
return vstd::contains(actions, actionType);
|
||||
}
|
||||
|
||||
@ -215,7 +214,15 @@ bool BattleAction::isSpellAction() const
|
||||
EActionType::HERO_SPELL,
|
||||
EActionType::MONSTER_SPELL
|
||||
};
|
||||
return vstd::contains(actions, actionType);
|
||||
}
|
||||
|
||||
bool BattleAction::isBattleEndAction() const
|
||||
{
|
||||
static const std::array<EActionType, 2> actions = {
|
||||
EActionType::RETREAT,
|
||||
EActionType::SURRENDER
|
||||
};
|
||||
return vstd::contains(actions, actionType);
|
||||
}
|
||||
|
||||
@ -227,7 +234,6 @@ bool BattleAction::isTacticsAction() const
|
||||
EActionType::RETREAT,
|
||||
EActionType::SURRENDER
|
||||
};
|
||||
|
||||
return vstd::contains(actions, actionType);
|
||||
}
|
||||
|
||||
|
@ -46,6 +46,7 @@ public:
|
||||
bool isTacticsAction() const;
|
||||
bool isUnitAction() const;
|
||||
bool isSpellAction() const;
|
||||
bool isBattleEndAction() const;
|
||||
std::string toString() const;
|
||||
|
||||
void aimToHex(const BattleHex & destination);
|
||||
|
@ -535,13 +535,20 @@ bool BattleActionProcessor::makeBattleActionImpl(const BattleAction &ba)
|
||||
logGlobal->trace("Making action: %s", ba.toString());
|
||||
const CStack * stack = gameHandler->gameState()->curB->battleGetStackByID(ba.stackNumber);
|
||||
|
||||
StartAction startAction(ba);
|
||||
gameHandler->sendAndApply(&startAction);
|
||||
// for these events client does not expects StartAction/EndAction wrapper
|
||||
if (!ba.isBattleEndAction())
|
||||
{
|
||||
StartAction startAction(ba);
|
||||
gameHandler->sendAndApply(&startAction);
|
||||
}
|
||||
|
||||
bool result = dispatchBattleAction(ba);
|
||||
|
||||
EndAction endAction;
|
||||
gameHandler->sendAndApply(&endAction);
|
||||
if (!ba.isBattleEndAction())
|
||||
{
|
||||
EndAction endAction;
|
||||
gameHandler->sendAndApply(&endAction);
|
||||
}
|
||||
|
||||
if(ba.actionType == EActionType::WAIT || ba.actionType == EActionType::DEFEND || ba.actionType == EActionType::SHOOT || ba.actionType == EActionType::MONSTER_SPELL)
|
||||
gameHandler->handleObstacleTriggersForUnit(*gameHandler->spellEnv, *stack);
|
||||
|
@ -147,6 +147,9 @@ bool BattleProcessor::checkBattleStateChanges()
|
||||
if (gameHandler->battleGetSiegeLevel() > 0)
|
||||
updateGateState();
|
||||
|
||||
if (resultProcessor->battleIsEnding())
|
||||
return true;
|
||||
|
||||
//check if battle ended
|
||||
if (auto result = gameHandler->battleIsFinished())
|
||||
{
|
||||
|
@ -528,6 +528,7 @@ void BattleResultProcessor::battleAfterLevelUp(const BattleResult &result)
|
||||
}
|
||||
|
||||
finishingBattle.reset();
|
||||
battleResult.reset();
|
||||
}
|
||||
|
||||
void BattleResultProcessor::setBattleResult(EBattleResult resultType, int victoriusSide)
|
||||
@ -537,3 +538,8 @@ void BattleResultProcessor::setBattleResult(EBattleResult resultType, int victor
|
||||
battleResult->winner = victoriusSide; //surrendering side loses
|
||||
gameHandler->gameState()->curB->calculateCasualties(battleResult->casualties);
|
||||
}
|
||||
|
||||
bool BattleResultProcessor::battleIsEnding() const
|
||||
{
|
||||
return battleResult != nullptr;
|
||||
}
|
||||
|
@ -71,6 +71,8 @@ public:
|
||||
explicit BattleResultProcessor(BattleProcessor * owner);
|
||||
void setGameHandler(CGameHandler * newGameHandler);
|
||||
|
||||
bool battleIsEnding() const;
|
||||
|
||||
void setBattleResult(EBattleResult resultType, int victoriusSide);
|
||||
void endBattle(int3 tile, const CGHeroInstance * hero1, const CGHeroInstance * hero2); //ends battle
|
||||
void endBattleConfirm(const BattleInfo * battleInfo);
|
||||
|
Loading…
Reference in New Issue
Block a user