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

Default constructors for Scholar, Pandora and Event.

Browse Source
This commit is contained in:
DjWarmonger 2014-09-23 09:46:31 +02:00
parent 3e36d0d88b
commit 8e1e8abe90
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/mapObjects/CGPandoraBox.h
View File

@ -35,6 +35,7 @@ public:
std::vector<SpellID> spells; //gained spells
CCreatureSet creatures; //gained creatures
CGPandoraBox() : gainedExp(0), manaDiff(0), moraleDiff(0), luckDiff(0){};
void initObj() override;
void onHeroVisit(const CGHeroInstance * h) const override;
void battleFinished(const CGHeroInstance *hero, const BattleResult &result) const override;
@ -69,6 +70,7 @@ public:
h & removeAfterVisit & availableFor & computerActivate & humanActivate;
}
CGEvent() : CGPandoraBox(){};
void onHeroVisit(const CGHeroInstance * h) const override;
private:
void activated(const CGHeroInstance * h) const;

1
lib/mapObjects/MiscObjects.h
View File

@ -127,6 +127,7 @@ public:
ui16 bonusID; //ID of skill/spell
// void giveAnyBonus(const CGHeroInstance * h) const; //TODO: remove
CGScholar() : bonusType(EBonusType::RANDOM){};
void onHeroVisit(const CGHeroInstance * h) const override;
void initObj() override;
template <typename Handler> void serialize(Handler &h, const int version)