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

Better handling other players for turn timer

Browse Source
This commit is contained in:
nordsoft 2023-08-20 04:06:52 +04:00
parent 314a17cdd9
commit a09cb23a85
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
client/adventureMap/TurnTimerWidget.cpp
View File

@ -70,7 +70,9 @@ void TurnTimerWidget::show(Canvas & to)
void TurnTimerWidget::setTime(int time) void TurnTimerWidget::setTime(int time)
{ {
int newTime = time / 1000; int newTime = time / 1000;
if((newTime != turnTime) && notifications.count(newTime)) if((LOCPLINT->cb->getCurrentPlayer() == LOCPLINT->playerID)
&& (newTime != turnTime)
&& notifications.count(newTime))
CCS->soundh->playSound(variables["notificationSound"].String()); CCS->soundh->playSound(variables["notificationSound"].String());
turnTime = newTime; turnTime = newTime;
if(auto w = widget<CLabel>("timer")) if(auto w = widget<CLabel>("timer"))
@ -108,6 +110,9 @@ void TurnTimerWidget::tick(uint32_t msPassed)
else setTime(cachedTurnTime); else setTime(cachedTurnTime);
}; };
auto * playerInfo = LOCPLINT->cb->getPlayer(player);
if(playerInfo && playerInfo->isHuman())
{
if(LOCPLINT->battleInt) if(LOCPLINT->battleInt)
{ {
if(time.isBattleEnabled()) if(time.isBattleEnabled())
@ -118,4 +123,7 @@ void TurnTimerWidget::tick(uint32_t msPassed)
timeCheckAndUpdate(time.turnTimer); timeCheckAndUpdate(time.turnTimer);
} }
} }
else
timeCheckAndUpdate(0);
}
} }

7
server/TurnTimerHandler.cpp
View File

@ -28,11 +28,8 @@ void TurnTimerHandler::onGameplayStart(PlayerState & state)
{ {
if(si->turnTimerInfo.isEnabled()) if(si->turnTimerInfo.isEnabled())
{ {
TurnTimeUpdate ttu; state.turnTimer = si->turnTimerInfo;
ttu.player = state.color; state.turnTimer.turnTimer = 0;
ttu.turnTimer = si->turnTimerInfo;
ttu.turnTimer.turnTimer = 0;
gameHandler.sendAndApply(&ttu);
} }
} }
} }