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

* simple mechanism for detecting desync after init

Browse Source 
* moving stacks in tactics phase won't affect stack queue  (part of #760)
* moved all boost headers in server to PCH
This commit is contained in:
Michał W. Urbańczyk
2012-03-27 20:08:54 +00:00
parent 7b7ddf987a
commit c698181c4c
9 changed files with 49 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/CGameState.cpp
View File

@ -23,7 +23,7 @@
#include "../lib/JsonNode.h"
#include "GameConstants.h"
boost::rand48 ran;
DLL_LINKAGE boost::rand48 ran;
class CGObjectInstance;
#ifdef min
@ -813,7 +813,7 @@ BattleInfo * CGameState::setupBattle(int3 tile, const CArmedInstance *armies[2],
return BattleInfo::setupBattle(tile, terrain, terType, armies, heroes, creatureBank, town);
}
void CGameState::init( StartInfo * si, ui32 checksum, int Seed )
void CGameState::init(StartInfo * si, ui32 checksum, int Seed, int expectedPostInitSeed /*= -1*/)
{
struct HLP
{
@ -1570,6 +1570,12 @@ void CGameState::init( StartInfo * si, ui32 checksum, int Seed )
map->checkForObjectives(); //needs to be run when all objects are properly placed
if(expectedPostInitSeed >= 0)
{
int actualSeed = ran();
assert(expectedPostInitSeed == actualSeed); //RNG must be in the same state on all machines when initialization is done (otherwise we have desync)
}
}
int CGameState::battleGetBattlefieldType(int3 tile)