games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-24 22:14:36 +02:00
Code Issues Releases Activity

Show time for other player during battle

Browse Source
This commit is contained in:
nordsoft 2023-08-26 05:58:22 +04:00
parent 0bb352565a
commit e4e9bcfb9b
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
client/adventureMap/TurnTimerWidget.cpp
View File

@ -13,6 +13,8 @@
#include "../CGameInfo.h"
#include "../CMusicHandler.h"
#include "../CPlayerInterface.h"
#include "../battle/BattleInterface.h"
#include "../battle/BattleStacksController.h"
#include "../render/EFont.h"
#include "../render/Graphics.h"
@ -21,6 +23,7 @@
#include "../widgets/Images.h"
#include "../widgets/TextControls.h"
#include "../../CCallback.h"
#include "../../lib/CStack.h"
#include "../../lib/CPlayerState.h"
#include "../../lib/filesystem/ResourceID.h"
@ -70,7 +73,7 @@ void TurnTimerWidget::show(Canvas & to)
void TurnTimerWidget::setTime(PlayerColor player, int time)
{
int newTime = time / 1000;
if((LOCPLINT->cb->isPlayerMakingTurn(LOCPLINT->playerID))
if(player == LOCPLINT->playerID)
&& (newTime != turnTime)
&& notifications.count(newTime))
{
@ -99,9 +102,15 @@ void TurnTimerWidget::tick(uint32_t msPassed)
if(!LOCPLINT || !LOCPLINT->cb)
return;
for (PlayerColor player(0); player < PlayerColor::PLAYER_LIMIT; ++player)
for (PlayerColor p(0); p < PlayerColor::PLAYER_LIMIT; ++p)
{
if (!LOCPLINT->cb->isPlayerMakingTurn(player))
auto player = p;
if(LOCPLINT->battleInt)
{
if(auto * stack = LOCPLINT->battleInt->stacksController->getActiveStack())
player = stack->getOwner();
}
else if (!LOCPLINT->cb->isPlayerMakingTurn(player))
continue;
auto time = LOCPLINT->cb->getPlayerTurnTime(player);