games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-06 09:09:40 +02:00
Code Issues Releases Activity

Fixes according to review

Browse Source
This commit is contained in:
Ivan Savenko
2023-08-24 23:34:28 +03:00
parent 97ba7df152
commit 940bdcee3e
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/processors/TurnOrderProcessor.cpp
View File

@@ -108,7 +108,7 @@ void TurnOrderProcessor::doStartPlayerTurn(PlayerColor which)
void TurnOrderProcessor::doEndPlayerTurn(PlayerColor which)
{
assert(playerMakingTurn(which));
assert(isPlayerMakingTurn(which));
assert(gameHandler->getPlayerStatus(which) == EPlayerStatus::INGAME);
actingPlayers.erase(which);
@@ -149,7 +149,7 @@ void TurnOrderProcessor::onPlayerEndsGame(PlayerColor which)
bool TurnOrderProcessor::onPlayerEndsTurn(PlayerColor which)
{
if (!playerMakingTurn(which))
if (!isPlayerMakingTurn(which))
{
gameHandler->complain("Can not end turn for player that is not acting!");
return false;
@@ -197,17 +197,17 @@ void TurnOrderProcessor::tryStartTurnsForPlayers()
}
}
bool TurnOrderProcessor::playerAwaitsTurn(PlayerColor which) const
bool TurnOrderProcessor::isPlayerAwaitsTurn(PlayerColor which) const
{
return vstd::contains(awaitingPlayers, which);
}
bool TurnOrderProcessor::playerMakingTurn(PlayerColor which) const
bool TurnOrderProcessor::isPlayerMakingTurn(PlayerColor which) const
{
return vstd::contains(actingPlayers, which);
}
bool TurnOrderProcessor::playerAwaitsNewDay(PlayerColor which) const
bool TurnOrderProcessor::isPlayerAwaitsNewDay(PlayerColor which) const
{
return vstd::contains(actedPlayers, which);
}