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

Added serializer-based class able to make deep copies of objects — CMemorySerializer.

Browse Source 
CGameState::init will work on the deep copy of StartInfo.
Some casts to reduce warnings.
This commit is contained in:
Michał W. Urbańczyk
2014-02-08 21:54:35 +00:00
parent e6f433795b
commit 43ef565e7e
9 changed files with 77 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
lib/Connection.cpp
View File

@@ -20,6 +20,8 @@ using namespace boost::asio::ip;
extern template void registerTypes<CISer<CConnection> >(CISer<CConnection>& s);
extern template void registerTypes<COSer<CConnection> >(COSer<CConnection>& s);
extern template void registerTypes<CISer<CMemorySerializer> >(CISer<CMemorySerializer>& s);
extern template void registerTypes<COSer<CMemorySerializer> >(COSer<CMemorySerializer>& s);
extern template void registerTypes<CSaveFile>(CSaveFile & s);
extern template void registerTypes<CLoadFile>(CLoadFile & s);
extern template void registerTypes<CTypeList>(CTypeList & s);
@@ -40,6 +42,7 @@ CTypeList typeList;
#define LIL_ENDIAN
#endif
void CConnection::init()
{
enableSmartPointerSerializatoin();
@@ -354,9 +357,9 @@ CLoadFile::~CLoadFile()
{
}
int CLoadFile::read( const void * data, unsigned size )
int CLoadFile::read(void * data, unsigned size)
{
sfile->read((char *)data,size);
sfile->read((char*)data,size);
return size;
}
@@ -427,7 +430,7 @@ void CLoadFile::clear()
void CLoadFile::checkMagicBytes( const std::string &text )
{
std::string loaded = text;
read(loaded.c_str(), text.length());
read((void*)loaded.data(), text.length());
if(loaded != text)
throw std::runtime_error("Magic bytes doesn't match!");
}
@@ -506,7 +509,7 @@ CLoadIntegrityValidator::CLoadIntegrityValidator( const std::string &primaryFile
fileVersion = primaryFile->fileVersion;
}
int CLoadIntegrityValidator::read( const void * data, unsigned size )
int CLoadIntegrityValidator::read( void * data, unsigned size )
{
assert(primaryFile);
assert(controlFile);
@@ -544,3 +547,29 @@ void CLoadIntegrityValidator::checkMagicBytes( const std::string &text )
primaryFile->checkMagicBytes(text);
controlFile->checkMagicBytes(text);
}
int CMemorySerializer::read(void * data, unsigned size)
{
if(buffer.size() < readPos + size)
throw std::runtime_error(boost::str(boost::format("Cannot read past the buffer (accessing index %d, while size is %d)!") % (readPos + size - 1) % buffer.size()));
std::memcpy(data, buffer.data() + readPos, size);
readPos += size;
return size;
}
int CMemorySerializer::write(const void * data, unsigned size)
{
auto oldSize = buffer.size(); //and the pos to write from
buffer.resize(oldSize + size);
std::memcpy(buffer.data() + oldSize, data, size);
return size;
}
CMemorySerializer::CMemorySerializer()
{
readPos = 0;
registerTypes(static_cast<CISer<CMemorySerializer>&>(*this));
registerTypes(static_cast<COSer<CMemorySerializer>&>(*this));
}