From fc5ba333f8832f3d8e054e7c74df1e3cd353645f Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 31 May 2012 22:23:23 +0300 Subject: Add sittop sprites support. Add groundtop collision support (not collision but special selected tiles). --- src/map.h | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'src/map.h') 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 -- cgit v1.2.3-60-g2f50