games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00
Code Issues Releases Activity

Revert "multiplayer load changes"

Browse Source 
This reverts commit 368d2c8836cc6e3b5af9cf71e892bf4515f26bda.
This commit is contained in:
Patrick Simmons
2014-10-19 22:13:10 -04:00
parent 99a63c4bbd
commit 3685e96042
2 changed files with 64 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/CVCMIServer.cpp
View File

@@ -32,12 +32,6 @@
#include "../lib/UnlockGuard.h"
#include "../client/Client.h"
extern template void CClient::serialize<COSer<CSaveFile>>( COSer<CSaveFile> &h, const int version );
extern template void CClient::serialize<CISer<CConnection>>( CISer<CConnection> &h, const int version );
extern template void CClient::serialize<COSer<CConnection>>( COSer<CConnection> &h, const int version );
#if defined(__GNUC__) && !defined (__MINGW32__) && !defined(VCMI_ANDROID)
#include <execinfo.h>
#endif
@@ -497,13 +491,11 @@ void CVCMIServer::loadGame()
c << ui8(0);
CConnection* cc; //tcp::socket * ss;
CClient client_in;
for(int i=0; i<clients; i++)
{
if(!i)
{
cc = &c;
(*cc) >> client_in;
}
else
{
@@ -516,8 +508,8 @@ void CVCMIServer::loadGame()
continue;
}
cc = new CConnection(s,NAME);
(*cc) << client_in;
}
cc->addStdVecItems(gh.gs);
}
gh.conns.insert(cc);
}