games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-06 09:09:40 +02:00
Code Issues Releases Activity

Merge pull request #146 from vcmi/feature/VCMIMapFormat1

Browse Source 
Ok let's try it.
This commit is contained in:
DjWarmonger
2016-03-01 07:49:54 +01:00
parent 5778082842 772bc9e6c1
commit 8f1fba9551
89 changed files with 4536 additions and 582 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/mapObjects/CGTownInstance.h
View File

@@ -52,6 +52,9 @@ public:
CSpecObjInfo * info; //h3m info about dewlling
TCreaturesSet creatures; //creatures[level] -> <vector of alternative ids (base creature and upgrades, creatures amount>
protected:
void serializeJsonOptions(JsonSerializeFormat & handler) override;
private:
void initObj() override;
void onHeroVisit(const CGHeroInstance * h) const override;
@@ -254,4 +257,5 @@ public:
std::string getObjectName() const override;
protected:
void setPropertyDer(ui8 what, ui32 val) override;
void serializeJsonOptions(JsonSerializeFormat & handler) override;
};