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

SUCCESS!

Browse Source
This commit is contained in:
Patrick Simmons
2014-10-23 23:15:41 -04:00
parent 7babdccd59
commit 6aa3c11084
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
client/Client.cpp
View File

@ -326,6 +326,8 @@ void CClient::loadGame(const std::string & fname, const bool server, const std::
#if 1 #if 1
void CClient::loadGame(const std::string & fname, const bool server, const std::vector<int>& humanplayerindices, const int loadNumPlayers, int player_, const std::string & ipaddr, const std::string & port) void CClient::loadGame(const std::string & fname, const bool server, const std::vector<int>& humanplayerindices, const int loadNumPlayers, int player_, const std::string & ipaddr, const std::string & port)
{ {
PlayerColor player(player_); //intentional shadowing
logNetwork->infoStream() <<"Loading procedure started!"; logNetwork->infoStream() <<"Loading procedure started!";
CServerHandler sh; CServerHandler sh;
@ -374,7 +376,10 @@ void CClient::loadGame(const std::string & fname, const bool server, const std::
throw; //obviously we cannot continue here throw; //obviously we cannot continue here
} }
std::cout << player << std::endl; /*
if(!server)
player = PlayerColor(player_);
*/
std::set<PlayerColor> clientPlayers; std::set<PlayerColor> clientPlayers;
if(server) if(server)
@ -394,6 +399,8 @@ void CClient::loadGame(const std::string & fname, const bool server, const std::
logNetwork->infoStream() << "Server opened savegame properly."; logNetwork->infoStream() << "Server opened savegame properly.";
} }
player = PlayerColor(player_);
if(server) if(server)
{ {
for(auto & elem : gs->scenarioOps->playerInfos) for(auto & elem : gs->scenarioOps->playerInfos)
@ -405,9 +412,14 @@ void CClient::loadGame(const std::string & fname, const bool server, const std::
} }
else else
{ {
clientPlayers.insert(player.get()); clientPlayers.insert(player);
} }
std::cout << "CLIENTPLAYERS:\n";
for(auto x : clientPlayers)
std::cout << x << std::endl;
std::cout << "ENDCLIENTPLAYERS\n";
serialize(*loader,0,clientPlayers); serialize(*loader,0,clientPlayers);
*serv << ui32(clientPlayers.size()); *serv << ui32(clientPlayers.size());
for(auto & elem : clientPlayers) for(auto & elem : clientPlayers)