summaryrefslogtreecommitdiff
path: root/src/being
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/being
parent835dd846af75ea2cfc91f0134156f9c6545dd8ce (diff)
downloadManaVerse-77bb74bd2d944be1a1dc719027dbf37ad088b828.tar.gz
ManaVerse-77bb74bd2d944be1a1dc719027dbf37ad088b828.tar.bz2
ManaVerse-77bb74bd2d944be1a1dc719027dbf37ad088b828.tar.xz
ManaVerse-77bb74bd2d944be1a1dc719027dbf37ad088b828.zip
Move blocktype into separate file.
Diffstat (limited to 'src/being')
-rw-r--r--src/being/actorsprite.h5
-rw-r--r--src/being/being.h6
2 files changed, 7 insertions, 4 deletions
diff --git a/src/being/actorsprite.h b/src/being/actorsprite.h
index bda1ea611..e21cbe5d6 100644
--- a/src/being/actorsprite.h
+++ b/src/being/actorsprite.h
@@ -24,6 +24,7 @@
#include "localconsts.h"
+#include "resources/map/blocktype.h"
#include "resources/map/map.h"
#include "resources/map/mapconsts.h"
@@ -103,8 +104,8 @@ public:
/**
* Gets the way the object blocks pathfinding for other objects
*/
- virtual Map::BlockType getBlockType() const A_WARN_UNUSED
- { return Map::BLOCKTYPE_NONE; }
+ virtual BlockType::BlockType getBlockType() const A_WARN_UNUSED
+ { return BlockType::NONE; }
/**
* Take control of a particle.
diff --git a/src/being/being.h b/src/being/being.h
index 989036974..a55c5858f 100644
--- a/src/being/being.h
+++ b/src/being/being.h
@@ -25,6 +25,8 @@
#include "resources/beinginfo.h"
+#include "resources/map/blocktype.h"
+
#include "being/gender.h"
#include <map>
@@ -457,10 +459,10 @@ class Being : public ActorSprite, public ConfigListener
/**
* Gets the way the monster blocks pathfinding for other objects
*/
- Map::BlockType getBlockType() const A_WARN_UNUSED
+ BlockType::BlockType getBlockType() const A_WARN_UNUSED
{
if (!mInfo)
- return Map::BLOCKTYPE_NONE;
+ return BlockType::NONE;
return mInfo->getBlockType();
}