games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-30 08:57:00 +02:00
Code Issues Releases Activity

Fix battle replaying

Browse Source
This commit is contained in:
Ivan Savenko 2023-08-23 22:46:42 +03:00
parent 26bddbac44
commit a84c5fa371
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
server/battles/BattleProcessor.cpp
View File

@ -67,6 +67,7 @@ void BattleProcessor::startBattlePrimary(const CArmedInstance *army1, const CArm
heroes[0] = hero1;
heroes[1] = hero2;
resultProcessor->setupBattle();
setupBattle(tile, armies, heroes, creatureBank, town); //initializes stacks, places creatures on battlefield, blocks and informs player interfaces
auto lastBattleQuery = std::dynamic_pointer_cast<CBattleQuery>(gameHandler->queries->topQuery(gameHandler->gameState()->curB->sides[0].color));

6
server/battles/BattleResultProcessor.cpp
View File

@ -539,6 +539,12 @@ void BattleResultProcessor::setBattleResult(EBattleResult resultType, int victor
gameHandler->gameState()->curB->calculateCasualties(battleResult->casualties);
}
void BattleResultProcessor::setupBattle()
{
finishingBattle.reset();
battleResult.reset();
}
bool BattleResultProcessor::battleIsEnding() const
{
return battleResult != nullptr;

1
server/battles/BattleResultProcessor.h
View File

@ -73,6 +73,7 @@ public:
bool battleIsEnding() const;
void setupBattle();
void setBattleResult(EBattleResult resultType, int victoriusSide);
void endBattle(int3 tile, const CGHeroInstance * hero1, const CGHeroInstance * hero2); //ends battle
void endBattleConfirm(const BattleInfo * battleInfo);