diff options
author | Andrei Karas <akaras@inbox.ru> | 2015-05-29 17:45:52 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2015-05-29 17:45:52 +0300 |
commit | 2d32dc27210d16102f9200de115f2c3f79a5cb22 (patch) | |
tree | 5aa84ebe6c5c1d708b14bee2bf0ce95df714fc1d /src/being/being.h | |
parent | 7bdb50605562e47f1d6ae134881c09bd42293be5 (diff) | |
download | plus-2d32dc27210d16102f9200de115f2c3f79a5cb22.tar.gz plus-2d32dc27210d16102f9200de115f2c3f79a5cb22.tar.bz2 plus-2d32dc27210d16102f9200de115f2c3f79a5cb22.tar.xz plus-2d32dc27210d16102f9200de115f2c3f79a5cb22.zip |
Use BeingTypeId in Being for subtypeid.
Diffstat (limited to 'src/being/being.h')
-rw-r--r-- | src/being/being.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/being/being.h b/src/being/being.h index 1b7db882a..b7ac4fcf0 100644 --- a/src/being/being.h +++ b/src/being/being.h @@ -107,7 +107,7 @@ class Being notfinal : public ActorSprite, */ Being(const BeingId id, const ActorType::Type type, - const uint16_t subtype, + const BeingTypeId subtype, Map *const map); A_DELETE_COPY(Being) @@ -361,13 +361,13 @@ class Being notfinal : public ActorSprite, void drawEmotion(Graphics *const graphics, const int offsetX, const int offsetY) const; - uint16_t getSubType() const + BeingTypeId getSubType() const { return mSubType; } /** * Set Being's subtype (mostly for view for monsters and NPCs) */ - void setSubtype(const uint16_t subtype, const uint16_t look); + void setSubtype(const BeingTypeId subtype, const uint16_t look); const BeingInfo *getInfo() const A_WARN_UNUSED { return mInfo; } @@ -997,9 +997,9 @@ class Being notfinal : public ActorSprite, Gender::Type mGender; BeingAction::Action mAction; - uint16_t mSubType; /**< Subtype (graphical view, basically) */ - uint8_t mDirection; /**< Facing direction */ - uint8_t mDirectionDelayed; /**< Facing direction */ + BeingTypeId mSubType; /**< Subtype (graphical view, basically) */ + uint8_t mDirection; /**< Facing direction */ + uint8_t mDirectionDelayed; /**< Facing direction */ SpriteDirection::Type mSpriteDirection; /**< Facing direction */ bool mShowName; bool mIsGM; |