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

Merge remote-tracking branch 'origin/develop' into fix_rmg_teams

Browse Source 
# Conflicts:
#	client/lobby/RandomMapTab.cpp
This commit is contained in:
Tomasz Zieliński
2023-10-26 10:31:41 +02:00
parent c59014ce18 ab7caa0777
commit 36911d1e0a
1271 changed files with 148868 additions and 117165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/rmg/CMapGenOptions.cpp
View File

@ -195,11 +195,11 @@ void CMapGenOptions::resetPlayersMap()
}
//Remove players who have undefined properties
boost::remove_if(players, [](std::pair<PlayerColor, CPlayerSettings> & player)
vstd::erase_if(players, [](const std::pair<PlayerColor, CPlayerSettings> & p)
{
return player.second.getPlayerType() != EPlayerType::AI && player.second.getStartingTown() == CPlayerSettings::RANDOM_TOWN;
return p.second.getPlayerType() != EPlayerType::AI && p.second.getStartingTown() == CPlayerSettings::RANDOM_TOWN;
});
int realPlayersCnt = getPlayerCount();
if (realPlayersCnt != RANDOM_SIZE)
{
@ -610,7 +610,7 @@ const CRmgTemplate * CMapGenOptions::getPossibleTemplate(CRandomGenerator & rand
return *RandomGeneratorUtil::nextItem(templates, rand);
}
CMapGenOptions::CPlayerSettings::CPlayerSettings() : color(0), startingTown(RANDOM_TOWN), playerType(EPlayerType::AI), team(TeamID::NO_TEAM)
CMapGenOptions::CPlayerSettings::CPlayerSettings() : color(0), startingTown(FactionID::RANDOM), playerType(EPlayerType::AI), team(TeamID::NO_TEAM)
{
}