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

Rebase of codebase changes for refactored serializer

Browse Source 
Some of newer fixes not yet merged there and save compatibility a bit off.
This commit is contained in:
Ivan Savenko
2016-09-10 03:32:40 +03:00
committed by Arseniy Shestakov
parent 3d1b1f4ba8
commit 5b76c3f4eb
33 changed files with 155 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/CGameState.cpp
View File

@ -11,7 +11,6 @@
#include "CHeroHandler.h"
#include "mapObjects/CObjectHandler.h"
#include "CModHandler.h"
#include "Connection.h"
#include "mapping/CMap.h"
#include "mapping/CMapService.h"
#include "StartInfo.h"
@ -25,6 +24,8 @@
#include "rmg/CMapGenerator.h"
#include "CStopWatch.h"
#include "mapping/CMapEditManager.h"
#include "serializer/CTypeList.h"
#include "serializer/CMemorySerializer.h"
#ifdef min
#undef min
@ -871,7 +872,7 @@ void CGameState::initDuel()
else
{
CLoadFile lf(scenarioOps->mapname);
lf.serializer >> dp;
lf.serializer & dp;
}
}
catch(...)
@ -2059,7 +2060,7 @@ PlayerRelations::PlayerRelations CGameState::getPlayerRelations( PlayerColor col
void CGameState::apply(CPack *pack)
{
ui16 typ = typeList.getTypeID(pack);
applierGs->apps[typ]->applyOnGS(this,pack);
applierGs->getApplier(typ)->applyOnGS(this,pack);
}
void CGameState::calculatePaths(const CGHeroInstance *hero, CPathsInfo &out)