diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-10-04 19:06:59 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-10-04 19:06:59 +0300 |
| commit | b844884ba160f7a0204382cbbce4c98ecae1139b (patch) | |
| tree | 6cc2e3a3c539a45563cf0986791817f5f44de3a0 /src/resources/map | |
| parent | 0a731a66a23061f24f83ce093f8d516497c17144 (diff) | |
| download | plus-b844884ba160f7a0204382cbbce4c98ecae1139b.tar.gz plus-b844884ba160f7a0204382cbbce4c98ecae1139b.tar.bz2 plus-b844884ba160f7a0204382cbbce4c98ecae1139b.tar.xz plus-b844884ba160f7a0204382cbbce4c98ecae1139b.zip | |
Move collisiontype into enums directory.
Diffstat (limited to 'src/resources/map')
| -rw-r--r-- | src/resources/map/map.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/src/resources/map/map.h b/src/resources/map/map.h index 40c0df7c1..a1f8c9f5a 100644 --- a/src/resources/map/map.h +++ b/src/resources/map/map.h @@ -69,18 +69,6 @@ class Map final : public Properties, public MemoryCounter { public: - enum CollisionTypes - { - 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_PLAYER_WALL = 5, // full collision for player - COLLISION_MONSTER_WALL = 6, // full collision for monster - COLLISION_MAX = 7 // count index - }; - /** * Constructor, taking map and tile size as parameters. */ |