diff options
author | Andrei Karas <akaras@inbox.ru> | 2015-05-29 20:33:10 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2015-05-29 20:33:10 +0300 |
commit | 9f1994182d4225f630a93ae06b01927c4f7a9a37 (patch) | |
tree | b3557f6c6e6a923170929fd6553b59f872634291 /src/being/being.h | |
parent | aef032f93b7bdc6e5908b2fa5f940a43bcfce50e (diff) | |
download | plus-9f1994182d4225f630a93ae06b01927c4f7a9a37.tar.gz plus-9f1994182d4225f630a93ae06b01927c4f7a9a37.tar.bz2 plus-9f1994182d4225f630a93ae06b01927c4f7a9a37.tar.xz plus-9f1994182d4225f630a93ae06b01927c4f7a9a37.zip |
Convert ActorType enum into strong typed enum.
Diffstat (limited to 'src/being/being.h')
-rw-r--r-- | src/being/being.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/being/being.h b/src/being/being.h index b7ac4fcf0..b1639f250 100644 --- a/src/being/being.h +++ b/src/being/being.h @@ -106,7 +106,7 @@ class Being notfinal : public ActorSprite, * @param map the map the being is on */ Being(const BeingId id, - const ActorType::Type type, + const ActorTypeT type, const BeingTypeId subtype, Map *const map); @@ -114,7 +114,7 @@ class Being notfinal : public ActorSprite, virtual ~Being(); - ActorType::Type getType() const override final A_WARN_UNUSED + ActorTypeT getType() const override final A_WARN_UNUSED { return mType; } /** @@ -736,12 +736,12 @@ class Being notfinal : public ActorSprite, static void clearCache(); static std::string loadComment(const std::string &name, - const ActorType::Type &type) + const ActorTypeT &type) A_WARN_UNUSED; static void saveComment(const std::string &restrict name, const std::string &restrict comment, - const ActorType::Type &restrict type); + const ActorTypeT &restrict type); bool isAdvanced() const A_WARN_UNUSED { return mAdvanced; } @@ -1023,7 +1023,7 @@ class Being notfinal : public ActorSprite, void dumpSprites() const; - const ActorType::Type mType; + const ActorTypeT mType; /** Speech Bubble components */ SpeechBubble *mSpeechBubble; |