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

Initialize new animations if current one is over

Browse Source
This commit is contained in:
Ivan Savenko 2023-01-04 18:15:26 +02:00
parent a1eaf4d9c8
commit d157735846
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
client/battle/BattleStacksController.cpp
View File

@ -350,27 +350,22 @@ void BattleStacksController::updateBattleAnimations()
{ {
// operate on copy - to prevent potential iterator invalidation due to push_back's // operate on copy - to prevent potential iterator invalidation due to push_back's
// FIXME? : remove remaining calls to addNewAnim from BattleAnimation::nextFrame (only Catapult explosion at the time of writing) // FIXME? : remove remaining calls to addNewAnim from BattleAnimation::nextFrame (only Catapult explosion at the time of writing)
auto copiedVector = currentAnimations; auto copiedVector = currentAnimations;
for (auto & elem : copiedVector) for (auto & elem : copiedVector)
{ if (elem && elem->isInitialized())
if (!elem)
continue;
if (elem->isInitialized())
elem->nextFrame(); elem->nextFrame();
else
for (auto & elem : copiedVector)
if (elem && !elem->isInitialized())
elem->tryInitialize(); elem->tryInitialize();
}
bool hadAnimations = !currentAnimations.empty(); bool hadAnimations = !currentAnimations.empty();
vstd::erase(currentAnimations, nullptr); vstd::erase(currentAnimations, nullptr);
if (hadAnimations && currentAnimations.empty()) if (hadAnimations && currentAnimations.empty())
{
//anims ended
owner.setAnimationCondition(EAnimationEvents::ACTION, false); owner.setAnimationCondition(EAnimationEvents::ACTION, false);
}
} }
void BattleStacksController::addNewAnim(BattleAnimation *anim) void BattleStacksController::addNewAnim(BattleAnimation *anim)