summaryrefslogtreecommitdiff
path: root/src/resources/beinginfo.h
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-05-11 16:44:15 +0300
committerAndrei Karas <akaras@inbox.ru>2014-05-11 16:44:15 +0300
commit77bb74bd2d944be1a1dc719027dbf37ad088b828 (patch)
tree0feb040a768eff20220835eb359e767dc43f113c /src/resources/beinginfo.h
parent835dd846af75ea2cfc91f0134156f9c6545dd8ce (diff)
downloadplus-77bb74bd2d944be1a1dc719027dbf37ad088b828.tar.gz
plus-77bb74bd2d944be1a1dc719027dbf37ad088b828.tar.bz2
plus-77bb74bd2d944be1a1dc719027dbf37ad088b828.tar.xz
plus-77bb74bd2d944be1a1dc719027dbf37ad088b828.zip
Move blocktype into separate file.
Diffstat (limited to 'src/resources/beinginfo.h')
-rw-r--r--src/resources/beinginfo.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/resources/beinginfo.h b/src/resources/beinginfo.h
index 81a1f749d..554b1efaf 100644
--- a/src/resources/beinginfo.h
+++ b/src/resources/beinginfo.h
@@ -138,10 +138,10 @@ class BeingInfo final
unsigned char getWalkMask() const A_WARN_UNUSED
{ return mWalkMask; }
- void setBlockType(const Map::BlockType &blockType)
+ void setBlockType(const BlockType::BlockType &blockType)
{ mBlockType = blockType; }
- Map::BlockType getBlockType() const A_WARN_UNUSED
+ BlockType::BlockType getBlockType() const A_WARN_UNUSED
{ return mBlockType; }
void setTargetOffsetX(const int n)
@@ -346,7 +346,7 @@ class BeingInfo final
ItemSoundEvents mSounds;
Attacks mAttacks;
unsigned char mWalkMask;
- Map::BlockType mBlockType;
+ BlockType::BlockType mBlockType;
const std::map <int, ColorDB::ItemColor> *mColors;
int mTargetOffsetX;
int mTargetOffsetY;