diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-05-11 17:00:44 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-05-11 17:00:44 +0300 |
| commit | 10cf17f8d83d2d925641f722acc004828dba3094 (patch) | |
| tree | 46a746d5bfe79e067cd25a3caca476ecbafa0af5 /src/resources/map/map.h | |
| parent | 77bb74bd2d944be1a1dc719027dbf37ad088b828 (diff) | |
| download | manaplus-10cf17f8d83d2d925641f722acc004828dba3094.tar.gz manaplus-10cf17f8d83d2d925641f722acc004828dba3094.tar.bz2 manaplus-10cf17f8d83d2d925641f722acc004828dba3094.tar.xz manaplus-10cf17f8d83d2d925641f722acc004828dba3094.zip | |
Move blockmask into separate file.
Diffstat (limited to 'src/resources/map/map.h')
| -rw-r--r-- | src/resources/map/map.h | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/src/resources/map/map.h b/src/resources/map/map.h index 0085206a6..db9f09dd0 100644 --- a/src/resources/map/map.h +++ b/src/resources/map/map.h @@ -27,6 +27,7 @@ #include "being/actor.h" +#include "resources/map/blockmask.h" #include "resources/map/blocktype.h" #include "resources/map/metatile.h" #include "resources/map/properties.h" @@ -77,17 +78,6 @@ class Map final : public Properties, public ConfigListener COLLISION_MAX = 5 // count index }; - enum BlockMask - { - BLOCKMASK_WALL = 0x80, // 1000 0000 - BLOCKMASK_CHARACTER = 0x01, // 0000 0001 - BLOCKMASK_MONSTER = 0x02, // 0000 0010 - BLOCKMASK_AIR = 0x04, // 0000 0100 - BLOCKMASK_WATER = 0x08, // 0000 1000 - BLOCKMASK_GROUND = 0x10, // 0001 0000 - BLOCKMASK_GROUNDTOP = 0x20 // 0010 0000 - }; - enum DebugType { MAP_NORMAL = 0, @@ -171,8 +161,8 @@ class Map final : public Properties, public ConfigListener * without walkmask, only blocks against colliding tiles. */ bool getWalk(const int x, const int y, - const unsigned char walkmask = BLOCKMASK_WALL - | BLOCKMASK_AIR | BLOCKMASK_WATER) const A_WARN_UNUSED; + const unsigned char walkmask = BlockMask::WALL + | BlockMask::AIR | BlockMask::WATER) const A_WARN_UNUSED; void setWalk(const int x, const int y, const bool walkable); |