diff options
author | Andrei Karas <akaras@inbox.ru> | 2015-01-18 14:06:44 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2015-01-18 14:06:44 +0300 |
commit | 64309d7a7dc6380d62fa11363073d4243cbfa665 (patch) | |
tree | e9ac37f294e2a612391be6afa199b689e90defe8 /src/being | |
parent | bc22bc4da27d80627fa966660670219b3652e9ec (diff) | |
download | mv-64309d7a7dc6380d62fa11363073d4243cbfa665.tar.gz mv-64309d7a7dc6380d62fa11363073d4243cbfa665.tar.bz2 mv-64309d7a7dc6380d62fa11363073d4243cbfa665.tar.xz mv-64309d7a7dc6380d62fa11363073d4243cbfa665.zip |
Convert player look variable format from 8 bit to 16 bit.
Diffstat (limited to 'src/being')
-rw-r--r-- | src/being/being.cpp | 4 | ||||
-rw-r--r-- | src/being/being.h | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/being/being.cpp b/src/being/being.cpp index 838892119..03e13156c 100644 --- a/src/being/being.cpp +++ b/src/being/being.cpp @@ -301,7 +301,7 @@ void Being::createSpeechBubble() mSpeechBubble->postInit(); } -void Being::setSubtype(const uint16_t subtype, const uint8_t look) +void Being::setSubtype(const uint16_t subtype, const uint16_t look) { if (!mInfo) return; @@ -3409,7 +3409,7 @@ void Being::playSfx(const SoundInfo &sound, Being *const being, BLOCK_END("Being::playSfx") } -void Being::setLook(const uint8_t look) +void Being::setLook(const uint16_t look) { if (mType == ActorType::Player) setSubtype(mSubType, look); diff --git a/src/being/being.h b/src/being/being.h index fab70ff8f..e11f36003 100644 --- a/src/being/being.h +++ b/src/being/being.h @@ -379,7 +379,7 @@ class Being notfinal : public ActorSprite, /** * Set Being's subtype (mostly for view for monsters and NPCs) */ - void setSubtype(const uint16_t subtype, const uint8_t look); + void setSubtype(const uint16_t subtype, const uint16_t look); const BeingInfo *getInfo() const A_WARN_UNUSED { return mInfo; } @@ -849,10 +849,10 @@ class Being notfinal : public ActorSprite, void playSfx(const SoundInfo &sound, Being *const being, const bool main, const int x, const int y) const; - uint8_t getLook() const + uint16_t getLook() const { return mLook; } - void setLook(const uint8_t look); + void setLook(const uint16_t look); static uint8_t genderToInt(const Gender::Type sex) A_WARN_UNUSED; @@ -1076,7 +1076,7 @@ class Being notfinal : public ActorSprite, int mUsageCounter; int mKarma; int mManner; - uint8_t mLook; + uint16_t mLook; unsigned char mHairColor; bool mErased; bool mEnemy; |