From ac8a0111677c27779b2e7effe8ffe42ea013eb57 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sun, 7 Aug 2016 19:16:09 +0300
Subject: Add monster wall collision type.

---
 src/enums/resources/map/blockmask.h | 13 +++++++------
 src/enums/resources/map/blocktype.h | 15 ++++++++-------
 2 files changed, 15 insertions(+), 13 deletions(-)

(limited to 'src/enums/resources')

diff --git a/src/enums/resources/map/blockmask.h b/src/enums/resources/map/blockmask.h
index f5b5b25e0..02b6b5fe9 100644
--- a/src/enums/resources/map/blockmask.h
+++ b/src/enums/resources/map/blockmask.h
@@ -27,12 +27,13 @@ namespace BlockMask
 {
     enum BlockMask
     {
-        WALL       = 0x80,  // 1000 0000
-        AIR        = 0x04,  // 0000 0100
-        WATER      = 0x08,  // 0000 1000
-        GROUND     = 0x10,  // 0001 0000
-        GROUNDTOP  = 0x20,  // 0010 0000
-        PLAYERWALL = 0x40   // 0100 0000
+        WALL        = 0x80,  // 1000 0000
+        AIR         = 0x04,  // 0000 0100
+        WATER       = 0x08,  // 0000 1000
+        GROUND      = 0x10,  // 0001 0000
+        GROUNDTOP   = 0x20,  // 0010 0000
+        PLAYERWALL  = 0x40,  // 0100 0000
+        MONSTERWALL = 0x80   // 1000 0000
     };
 }  // namespace BlockMask
 
diff --git a/src/enums/resources/map/blocktype.h b/src/enums/resources/map/blocktype.h
index c7a7754de..54895fd4a 100644
--- a/src/enums/resources/map/blocktype.h
+++ b/src/enums/resources/map/blocktype.h
@@ -27,13 +27,14 @@
 
 enumStart(BlockType)
 {
-    NONE       = -1,
-    GROUND     = 0,
-    WALL       = 1,
-    AIR        = 2,
-    WATER      = 3,
-    GROUNDTOP  = 4,
-    PLAYERWALL = 5,
+    NONE        = -1,
+    GROUND      = 0,
+    WALL        = 1,
+    AIR         = 2,
+    WATER       = 3,
+    GROUNDTOP   = 4,
+    PLAYERWALL  = 5,
+    MONSTERWALL = 6,
     NB_BLOCKTYPES
 }
 enumEnd(BlockType);
-- 
cgit v1.2.3-60-g2f50