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

basic functionality

Browse Source
This commit is contained in:
Laserlicht
2023-12-23 03:06:48 +01:00
committed by GitHub
parent 56e1265097
commit 0b4cf14a3d
5 changed files with 59 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
client/battle/BattleStacksController.cpp
View File

@@ -346,7 +346,7 @@ void BattleStacksController::showStack(Canvas & canvas, const CStack * stack)
void BattleStacksController::tick(uint32_t msPassed)
{
updateHoveredStacks();
updateHoveredStacks(false);
updateBattleAnimations(msPassed);
}
@@ -806,20 +806,21 @@ void BattleStacksController::removeExpiredColorFilters()
});
}
void BattleStacksController::updateHoveredStacks()
void BattleStacksController::updateHoveredStacks(bool clear)
{
auto newStacks = selectHoveredStacks();
if(clear)
owner.windowObject->updateStackInfoWindow(nullptr);
for(const auto * stack : mouseHoveredStacks)
{
if (vstd::contains(newStacks, stack))
continue;
owner.windowObject->updateStackInfoWindow(nullptr);
if (stack == activeStack)
{
owner.windowObject->updateStackInfoWindow(stack);
stackAnimation[stack->unitId()]->setBorderColor(AnimationControls::getGoldBorder());
}
else
stackAnimation[stack->unitId()]->setBorderColor(AnimationControls::getNoBorder());
}
@@ -829,6 +830,7 @@ void BattleStacksController::updateHoveredStacks()
if (vstd::contains(mouseHoveredStacks, stack))
continue;
owner.windowObject->updateStackInfoWindow(newStacks.size() == 1 && vstd::find_pos(newStacks, stack) == 0 ? stack : nullptr);
stackAnimation[stack->unitId()]->setBorderColor(AnimationControls::getBlueBorder());
if (stackAnimation[stack->unitId()]->framesInGroup(ECreatureAnimType::MOUSEON) > 0 && stack->alive() && !stack->isFrozen())
stackAnimation[stack->unitId()]->playOnce(ECreatureAnimType::MOUSEON);