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

- Fixed bug when starting random map with 1 player - Refactoring - Fixed compile bug - Heroes can be selected in map selection screen(RMG map) - Main town gen

Browse Source
This commit is contained in:
beegee1
2013-01-20 14:43:58 +00:00
parent 5b919d88eb
commit 1cab54b87a
8 changed files with 45 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/CGameState.cpp
View File

@ -898,21 +898,27 @@ void CGameState::init(StartInfo * si)
map = mapGen.generate().release();
// Update starting options
for(auto it = scenarioOps->playerInfos.begin(); it != scenarioOps->playerInfos.end();)
for(int i = 0; i < map->players.size(); ++i)
{
PlayerSettings & pSettings = it->second;
if(!(map->players[pSettings.color].canHumanPlay || map->players[pSettings.color].canComputerPlay))
const PlayerInfo & pInfo = map->players[i];
if(pInfo.canComputerPlay || pInfo.canHumanPlay)
{
scenarioOps->playerInfos.erase(it++);
PlayerSettings & pSettings = scenarioOps->playerInfos[i];
pSettings.compOnly = !pInfo.canHumanPlay;
pSettings.team = pInfo.team;
pSettings.castle = pInfo.defaultCastle();
if(pSettings.playerID == PlayerSettings::PLAYER_AI && pSettings.name.empty())
{
pSettings.name = VLC->generaltexth->allTexts[468];
}
pSettings.color = i;
}
else
{
pSettings.compOnly = !(map->players[pSettings.color].canHumanPlay);
pSettings.team = map->players[pSettings.color].team;
pSettings.castle = map->players[pSettings.color].defaultCastle();
++it;
scenarioOps->playerInfos.erase(i);
}
}
}
else
{