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

Replace "currentPlayer" from gamestate with "activePlayers"

Browse Source 
- Allows multiple active players at once, e.g. simturns
- Cleared up validation of netpacks by server, e.g. always check for
pack sender
This commit is contained in:
Ivan Savenko
2023-08-25 01:08:48 +03:00
parent 4500e59713
commit edd029c79c
16 changed files with 114 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
client/adventureMap/TurnTimerWidget.cpp
View File

@@ -67,14 +67,18 @@ void TurnTimerWidget::show(Canvas & to)
showAll(to);
}
void TurnTimerWidget::setTime(int time)
void TurnTimerWidget::setTime(PlayerColor player, int time)
{
int newTime = time / 1000;
if((LOCPLINT->cb->getCurrentPlayer() == LOCPLINT->playerID)
if((LOCPLINT->cb->isPlayerMakingTurn(LOCPLINT->playerID))
&& (newTime != turnTime)
&& notifications.count(newTime))
{
CCS->soundh->playSound(variables["notificationSound"].String());
}
turnTime = newTime;
if(auto w = widget<CLabel>("timer"))
{
std::ostringstream oss;
@@ -83,18 +87,23 @@ void TurnTimerWidget::setTime(int time)
if(graphics && LOCPLINT && LOCPLINT->cb
&& variables["textColorFromPlayerColor"].Bool()
&& LOCPLINT->cb->getCurrentPlayer().isValidPlayer())
&& player.isValidPlayer())
{
w->setColor(graphics->playerColors[LOCPLINT->cb->getCurrentPlayer()]);
w->setColor(graphics->playerColors[player]);
}
}
}
void TurnTimerWidget::tick(uint32_t msPassed)
{
if(LOCPLINT && LOCPLINT->cb)
if(!LOCPLINT || !LOCPLINT->cb)
return;
for (PlayerColor player(0); player < PlayerColor::PLAYER_LIMIT; ++player)
{
auto player = LOCPLINT->cb->getCurrentPlayer();
if (!LOCPLINT->cb->isPlayerMakingTurn(player))
continue;
auto time = LOCPLINT->cb->getPlayerTurnTime(player);
cachedTurnTime -= msPassed;
if(cachedTurnTime < 0) cachedTurnTime = 0; //do not go below zero
@@ -107,7 +116,8 @@ void TurnTimerWidget::tick(uint32_t msPassed)
lastTurnTime = time;
cachedTurnTime = time;
}
else setTime(cachedTurnTime);
else
setTime(player, cachedTurnTime);
};
auto * playerInfo = LOCPLINT->cb->getPlayer(player);