1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-26 03:52:01 +02:00

code improvement

This commit is contained in:
Andrey Filipenkov 2022-10-01 09:24:58 +03:00
parent 99502c97d0
commit 86708841f8

View File

@ -19,7 +19,7 @@ VCMI_LIB_NAMESPACE_BEGIN
class CGCreature; class CGCreature;
class DLL_LINKAGE CQuest class DLL_LINKAGE CQuest final
{ {
public: public:
enum Emission {MISSION_NONE = 0, MISSION_LEVEL = 1, MISSION_PRIMARY_STAT = 2, MISSION_KILL_HERO = 3, MISSION_KILL_CREATURE = 4, enum Emission {MISSION_NONE = 0, MISSION_LEVEL = 1, MISSION_PRIMARY_STAT = 2, MISSION_KILL_HERO = 3, MISSION_KILL_CREATURE = 4,
@ -52,7 +52,6 @@ public:
bool isCustomFirst, isCustomNext, isCustomComplete; bool isCustomFirst, isCustomNext, isCustomComplete;
CQuest(); CQuest();
virtual ~CQuest(){};
static bool checkMissionArmy(const CQuest * q, const CCreatureSet * army); static bool checkMissionArmy(const CQuest * q, const CCreatureSet * army);
virtual bool checkQuest (const CGHeroInstance * h) const; //determines whether the quest is complete or not virtual bool checkQuest (const CGHeroInstance * h) const; //determines whether the quest is complete or not
@ -161,7 +160,7 @@ protected:
class DLL_LINKAGE CGQuestGuard : public CGSeerHut class DLL_LINKAGE CGQuestGuard : public CGSeerHut
{ {
public: public:
CGQuestGuard() : CGSeerHut(){}; CGQuestGuard() = default;
void init(CRandomGenerator & rand) override; void init(CRandomGenerator & rand) override;
void completeQuest (const CGHeroInstance * h) const override; void completeQuest (const CGHeroInstance * h) const override;
@ -209,7 +208,7 @@ public:
class DLL_LINKAGE CGBorderGuard : public CGKeys, public IQuestObject class DLL_LINKAGE CGBorderGuard : public CGKeys, public IQuestObject
{ {
public: public:
CGBorderGuard() : IQuestObject(){}; CGBorderGuard() = default;
void initObj(CRandomGenerator & rand) override; void initObj(CRandomGenerator & rand) override;
void onHeroVisit(const CGHeroInstance * h) const override; void onHeroVisit(const CGHeroInstance * h) const override;
void blockingDialogAnswered(const CGHeroInstance *hero, ui32 answer) const override; void blockingDialogAnswered(const CGHeroInstance *hero, ui32 answer) const override;
@ -231,7 +230,7 @@ public:
class DLL_LINKAGE CGBorderGate : public CGBorderGuard class DLL_LINKAGE CGBorderGate : public CGBorderGuard
{ {
public: public:
CGBorderGate() : CGBorderGuard(){}; CGBorderGate() = default;
void onHeroVisit(const CGHeroInstance * h) const override; void onHeroVisit(const CGHeroInstance * h) const override;
bool passableFor(PlayerColor color) const override; bool passableFor(PlayerColor color) const override;