1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-23 22:37:55 +02:00

Rebase of codebase changes for refactored serializer

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

View File

@@ -54,8 +54,8 @@ struct CPathsInfo;
class CCreature;
class CLoadFile;
class CSaveFile;
class CISer;
class COSer;
class BinaryDeserializer;
class BinarySerializer;
struct ArtifactLocation;
class CScriptingModule;
@@ -73,8 +73,8 @@ public:
virtual BattleAction activeStack(const CStack * stack)=0; //called when it's turn of that stack
virtual void yourTacticPhase(int distance){}; //called when interface has opportunity to use Tactics skill -> use cb->battleMakeTacticAction from this function
virtual void saveGame(COSer &h, const int version);
virtual void loadGame(CISer &h, const int version);
virtual void saveGame(BinarySerializer & h, const int version);
virtual void loadGame(BinaryDeserializer & h, const int version);
};
@@ -150,6 +150,6 @@ public:
virtual void battleEnd(const BattleResult *br) override;
virtual void battleStacksHealedRes(const std::vector<std::pair<ui32, ui32> > & healedStacks, bool lifeDrain, bool tentHeal, si32 lifeDrainFrom) override;
virtual void saveGame(COSer & h, const int version) override; //saving
virtual void loadGame(CISer & h, const int version) override; //loading
virtual void saveGame(BinarySerializer & h, const int version) override; //saving
virtual void loadGame(BinaryDeserializer & h, const int version) override; //loading
};