summaryrefslogtreecommitdiff
path: root/src/map.h
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-05-31 22:23:23 +0300
committerAndrei Karas <akaras@inbox.ru>2012-05-31 22:23:23 +0300
commitfc5ba333f8832f3d8e054e7c74df1e3cd353645f (patch)
tree16aabceaaa2b197d006bd357d3176acac292cde7 /src/map.h
parent9875c00dc37b1d7b55e1154075a0cd2d997a490d (diff)
downloadmv-fc5ba333f8832f3d8e054e7c74df1e3cd353645f.tar.gz
mv-fc5ba333f8832f3d8e054e7c74df1e3cd353645f.tar.bz2
mv-fc5ba333f8832f3d8e054e7c74df1e3cd353645f.tar.xz
mv-fc5ba333f8832f3d8e054e7c74df1e3cd353645f.zip
Add sittop sprites support.
Add groundtop collision support (not collision but special selected tiles).
Diffstat (limited to 'src/map.h')
-rw-r--r--src/map.h15
1 files changed, 9 insertions, 6 deletions
diff --git a/src/map.h b/src/map.h
index f9821f7e0..3f9df9f95 100644
--- a/src/map.h
+++ b/src/map.h
@@ -114,16 +114,18 @@ class Map : public Properties, public ConfigListener
BLOCKTYPE_AIR,
BLOCKTYPE_WATER,
BLOCKTYPE_GROUND,
+ BLOCKTYPE_GROUNDTOP,
NB_BLOCKTYPES
};
enum CollisionTypes
{
- COLLISION_EMPTY = 0,
- COLLISION_WALL = 1,
- COLLISION_AIR = 2,
- COLLISION_WATER = 3,
- COLLISION_MAX = 4
+ COLLISION_EMPTY = 0, // no collision
+ COLLISION_WALL = 1, // full collison
+ COLLISION_AIR = 2, // air units can walk
+ COLLISION_WATER = 3, // water units can walk
+ COLLISION_GROUNDTOP = 4, // no collision (chair, bed, etc)
+ COLLISION_MAX = 5 // count index
};
enum BlockMask
@@ -133,7 +135,8 @@ class Map : public Properties, public ConfigListener
BLOCKMASK_MONSTER = 0x02, // 0000 0010
BLOCKMASK_AIR = 0x04, // 0000 0100
BLOCKMASK_WATER = 0x08, // 0000 1000
- BLOCKMASK_GROUND = 0x16 // 0001 0000
+ BLOCKMASK_GROUND = 0x16, // 0001 0000
+ BLOCKMASK_GROUNDTOP = 0x32 // 0010 0000
};
enum DebugType