games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-24 22:14:36 +02:00
Code Issues Releases Activity

Version bump. Fixed crash on desync saves.

Browse Source
This commit is contained in:
Michał W. Urbańczyk 2013-02-19 12:24:17 +00:00
parent bbdac2f068
commit 9492592a8f
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/Connection.cpp
View File

@ -509,15 +509,17 @@ int CLoadIntegrityValidator::read( const void * data, unsigned size )
std::vector<ui8> controlData(size);
auto ret = primaryFile->read(data, size);
controlFile->read(controlData.data(), size);
if(!foundDesync && std::memcmp(data, controlData.data(), size))
{
tlog1 << "Desync found! Position: " << primaryFile->sfile->tellg() << std::endl;
foundDesync = true;
//throw std::runtime_error("Savegame dsynchronized!");
}
if(!foundDesync)
{
controlFile->read(controlData.data(), size);
if(std::memcmp(data, controlData.data(), size))
{
tlog1 << "Desync found! Position: " << primaryFile->sfile->tellg() << std::endl;
foundDesync = true;
//throw std::runtime_error("Savegame dsynchronized!");
}
}
return ret;
}

2
lib/GameConstants.h
View File

@ -14,7 +14,7 @@
namespace GameConstants
{
const std::string VCMI_VERSION = "VCMI 0.91b";
const std::string VCMI_VERSION = "VCMI 0.91c";
/*
* DATA_DIR contains the game data (Data/, MP3/, ...).