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

Replaced iterators with auto & loop.

Browse Source
This commit is contained in:
DjWarmonger 2015-10-25 07:07:01 +01:00
parent eb0af0096e
commit c47c08aa01
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
server/CGameHandler.cpp
View File

@ -1511,20 +1511,20 @@ void CGameHandler::newTurn()
}
//count days without town for all players, regardless of their turn order
for (auto p = gs->players.begin(); p != gs->players.end(); p++)
for (auto &p : gs->players)
{
PlayerState * playerState = &p->second;
if (playerState->status == EPlayerStatus::INGAME)
PlayerState & playerState = p.second;
if (playerState.status == EPlayerStatus::INGAME)
{
if (playerState->towns.empty())
if (playerState.towns.empty())
{
if (playerState->daysWithoutCastle)
++(*playerState->daysWithoutCastle);
else playerState->daysWithoutCastle = 0;
if (playerState.daysWithoutCastle)
++(*playerState.daysWithoutCastle);
else playerState.daysWithoutCastle = 0;
}
else
{
playerState->daysWithoutCastle = boost::none;
playerState.daysWithoutCastle = boost::none;
}
}
}
@ -4825,10 +4825,10 @@ void CGameHandler::checkVictoryLossConditionsForPlayer(PlayerColor player)
std::set<PlayerColor> playerColors;
//do not copy player state (CBonusSystemNode) by value
for (auto p = gs->players.begin(); p != gs->players.end(); p++) //players may have different colors, iterate over players and not integers
for (auto &p : gs->players) //players may have different colors, iterate over players and not integers
{
if (p->first != player)
playerColors.insert(p->first);
if (p.first != player)
playerColors.insert(p.first);
}
//notify all players