From ea0b61e18f36f28806940b00a2cddaef912c3340 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Tue, 13 May 2014 01:04:05 +0300
Subject: Move actor type into separate file.

---
 src/being/being.h | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'src/being/being.h')

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;
-- 
cgit v1.2.3-60-g2f50