diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-08-05 16:07:44 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-08-05 16:07:44 +0300 |
commit | 8480ff2ce8ac1ce1ceba024eddfaeb62a5d20f8d (patch) | |
tree | 5cc8d0097ce680cca550216e2313d1d1cb550cfc /src/resources/beinginfo.h | |
parent | 3aaf10f021303dd67a2c36bf23f380348b5bdf02 (diff) | |
download | mv-8480ff2ce8ac1ce1ceba024eddfaeb62a5d20f8d.tar.gz mv-8480ff2ce8ac1ce1ceba024eddfaeb62a5d20f8d.tar.bz2 mv-8480ff2ce8ac1ce1ceba024eddfaeb62a5d20f8d.tar.xz mv-8480ff2ce8ac1ce1ceba024eddfaeb62a5d20f8d.zip |
Rename walkMask into blockWalkMask.
Diffstat (limited to 'src/resources/beinginfo.h')
-rw-r--r-- | src/resources/beinginfo.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/resources/beinginfo.h b/src/resources/beinginfo.h index efac5cc3a..76955d2dd 100644 --- a/src/resources/beinginfo.h +++ b/src/resources/beinginfo.h @@ -110,14 +110,14 @@ class BeingInfo final const Attack *getAttack(const int id) const A_WARN_UNUSED; - void setWalkMask(const unsigned char mask) - { mWalkMask = mask; } + void setBlockWalkMask(const unsigned char mask) + { mBlockWalkMask = mask; } /** * Gets the way the being is blocked by other objects */ - unsigned char getWalkMask() const A_WARN_UNUSED - { return mWalkMask; } + unsigned char getBlockWalkMask() const A_WARN_UNUSED + { return mBlockWalkMask; } void setBlockType(const BlockType::BlockType &blockType) { mBlockType = blockType; } @@ -326,7 +326,7 @@ class BeingInfo final Cursor::Cursor mHoverCursor; ItemSoundEvents mSounds; Attacks mAttacks; - unsigned char mWalkMask; + unsigned char mBlockWalkMask; BlockType::BlockType mBlockType; const std::map <int, ColorDB::ItemColor> *mColors; int mTargetOffsetX; |