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

- moved json-related functions (e.g. ParseBonus) into JsonUtils namespace

Browse Source 
- replaced JsonNode::toStdVector with more universal convertTo
- some renaming in StartInfo
This commit is contained in:
Ivan Savenko
2012-12-02 12:21:44 +00:00
parent ca9033d0e4
commit c9dd80ea6d
20 changed files with 340 additions and 273 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
client/Client.cpp
View File

@@ -304,9 +304,9 @@ void CClient::newGame( CConnection *con, StartInfo *si )
for(auto it = si->playerInfos.begin(); it != si->playerInfos.end(); ++it)
{
if((networkMode == SINGLE) //single - one client has all player
|| (networkMode != SINGLE && serv->connectionID == it->second.human) //multi - client has only "its players"
|| (networkMode == HOST && it->second.human == false)) //multi - host has all AI players
if((networkMode == SINGLE) //single - one client has all player
|| (networkMode != SINGLE && serv->connectionID == it->second.playerID) //multi - client has only "its players"
|| (networkMode == HOST && it->second.playerID == PlayerSettings::PLAYER_AI))//multi - host has all AI players
{
myPlayers.insert(it->first); //add player
}
@@ -368,7 +368,7 @@ void CClient::newGame( CConnection *con, StartInfo *si )
if(si->mode != StartInfo::DUEL)
{
auto cb = make_shared<CCallback>(gs,color,this);
if(!it->second.human)
if(it->second.playerID == PlayerSettings::PLAYER_AI)
{
std::string AItoGive = settings["server"]["playerAI"].String();
if(!sensibleAILimit)