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

Early changes towards MP support.

Browse Source 
It's possible to connect several clients (running on localhost) and enter MP pregame. The actual MP game still not playable. (though it can be started)
This commit is contained in:
Michał W. Urbańczyk
2010-10-24 11:35:14 +00:00
parent aa131bbf15
commit daeb3af67a
24 changed files with 1694 additions and 616 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
lib/Connection.cpp
View File

@@ -71,6 +71,11 @@ void CConnection::init()
tlog0 << "Established connection with "<<pom<<std::endl;
wmx = new boost::mutex;
rmx = new boost::mutex;
handler = NULL;
receivedStop = sendStop = false;
static int cid = 1;
connectionID = cid++;
}
CConnection::CConnection(std::string host, std::string port, std::string Name)
@@ -180,6 +185,11 @@ int CConnection::read(void * data, unsigned size)
}
CConnection::~CConnection(void)
{
if(handler)
handler->join();
delete handler;
close();
delete io_service;
delete wmx;
@@ -280,11 +290,11 @@ void CSaveFile::reportState(CLogger &out)
}
}
CLoadFile::CLoadFile( const std::string &fname, bool requireLatest )
CLoadFile::CLoadFile(const std::string &fname, int minimalVersion /*= version*/)
:sfile(NULL)
{
registerTypes(*this);
openNextFile(fname, requireLatest);
openNextFile(fname, minimalVersion);
}
CLoadFile::~CLoadFile()
@@ -304,7 +314,7 @@ void CLoadFile::close()
sfile = NULL;
}
void CLoadFile::openNextFile(const std::string &fname, bool requireLatest)
void CLoadFile::openNextFile(const std::string &fname, int minimalVersion)
{
fName = fname;
sfile = new std::ifstream(fname.c_str(),std::ios::binary);
@@ -320,16 +330,16 @@ void CLoadFile::openNextFile(const std::string &fname, bool requireLatest)
if(std::memcmp(buffer,"VCMI",4))
{
tlog1 << "Error: not a VCMI save! (file " << fname << " )\n";
tlog1 << "Error: not a VCMI file! ( " << fname << " )\n";
delete sfile;
sfile = NULL;
return;
}
*this >> myVersion;
if(myVersion != version && requireLatest)
if(myVersion < minimalVersion)
{
tlog1 << "Error: Not supported save format! (file " << fname << " )\n";
tlog1 << "Error: Old file format! (file " << fname << " )\n";
delete sfile;
sfile = NULL;
}
@@ -371,6 +381,11 @@ ui16 CTypeList::getTypeID( const std::type_info *type )
return 0;
}
std::ostream & operator<<(std::ostream &str, const CConnection &cpc)
{
return str << "Connection with " << cpc.name << " (ID: " << cpc.connectionID << /*", " << (cpc.host ? "host" : "guest") <<*/ ")";
}
CSerializer::~CSerializer()
{