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

Reworked timer widget to show timers for all players

Browse Source
This commit is contained in:
Ivan Savenko
2023-12-19 17:41:20 +02:00
parent 4ed283a357
commit da9c0feebc
5 changed files with 147 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
lib/TurnTimerInfo.cpp
View File

@@ -22,4 +22,41 @@ bool TurnTimerInfo::isBattleEnabled() const
return turnTimer > 0 || baseTimer > 0 || unitTimer > 0 || battleTimer > 0;
}
void TurnTimerInfo::substractTimer(int timeMs)
{
auto const & substractTimer = [&timeMs](int & targetTimer)
{
if (targetTimer > timeMs)
{
targetTimer -= timeMs;
timeMs = 0;
}
else
{
timeMs -= targetTimer;
targetTimer = 0;
}
};
substractTimer(unitTimer);
substractTimer(battleTimer);
substractTimer(turnTimer);
substractTimer(baseTimer);
}
int TurnTimerInfo::valueMs() const
{
return baseTimer + turnTimer + battleTimer + unitTimer;
}
bool TurnTimerInfo::operator == (const TurnTimerInfo & other) const
{
return turnTimer == other.turnTimer &&
baseTimer == other.baseTimer &&
battleTimer == other.battleTimer &&
unitTimer == other.unitTimer &&
accumulatingTurnTimer == other.accumulatingTurnTimer &&
accumulatingUnitTimer == other.accumulatingUnitTimer;
}
VCMI_LIB_NAMESPACE_END