summaryrefslogtreecommitdiff
path: root/src/being/being.h
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-05-13 01:04:05 +0300
committerAndrei Karas <akaras@inbox.ru>2014-05-13 01:04:05 +0300
commitea0b61e18f36f28806940b00a2cddaef912c3340 (patch)
tree616205f44832d4ced4fc0b50b650eedb0fbf435c /src/being/being.h
parent814e88e5ca69bc54837be27429dbf42dd41f7ac6 (diff)
downloadManaVerse-ea0b61e18f36f28806940b00a2cddaef912c3340.tar.gz
ManaVerse-ea0b61e18f36f28806940b00a2cddaef912c3340.tar.bz2
ManaVerse-ea0b61e18f36f28806940b00a2cddaef912c3340.tar.xz
ManaVerse-ea0b61e18f36f28806940b00a2cddaef912c3340.zip
Move actor type into separate file.
Diffstat (limited to 'src/being/being.h')
-rw-r--r--src/being/being.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/being/being.h b/src/being/being.h
index 52a88bd2e..dfa920e68 100644
--- a/src/being/being.h
+++ b/src/being/being.h
@@ -111,14 +111,16 @@ class Being : public ActorSprite, public ConfigListener
* @param subtype partly determines the type of the being
* @param map the map the being is on
*/
- Being(const int id, const Type type, const uint16_t subtype,
+ Being(const int id,
+ const ActorType::Type type,
+ const uint16_t subtype,
Map *const map);
A_DELETE_COPY(Being)
virtual ~Being();
- Type getType() const A_WARN_UNUSED
+ ActorType::Type getType() const override final A_WARN_UNUSED
{ return mType; }
/**
@@ -630,7 +632,7 @@ class Being : public ActorSprite, public ConfigListener
void setGM(const bool gm);
bool canTalk() const A_WARN_UNUSED
- { return mType == NPC; }
+ { return mType == ActorType::NPC; }
void talkTo() const;
@@ -981,7 +983,7 @@ class Being : public ActorSprite, public ConfigListener
void dumpSprites() const;
- const Type mType;
+ const ActorType::Type mType;
/** Speech Bubble components */
SpeechBubble *mSpeechBubble;