From b1753d59caa299c668b9c269e87f96c46e0ab33a Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sun, 7 Aug 2016 18:23:39 +0300
Subject: Add player wall collision type (5).

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

(limited to 'src/enums/resources/map')

diff --git a/src/enums/resources/map/blockmask.h b/src/enums/resources/map/blockmask.h
index 127938d7c..f5b5b25e0 100644
--- a/src/enums/resources/map/blockmask.h
+++ b/src/enums/resources/map/blockmask.h
@@ -27,11 +27,12 @@ namespace BlockMask
 {
     enum BlockMask
     {
-        WALL      = 0x80,  // 1000 0000
-        AIR       = 0x04,  // 0000 0100
-        WATER     = 0x08,  // 0000 1000
-        GROUND    = 0x10,  // 0001 0000
-        GROUNDTOP = 0x20   // 0010 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
     };
 }  // namespace BlockMask
 
diff --git a/src/enums/resources/map/blocktype.h b/src/enums/resources/map/blocktype.h
index 8183e26e1..c7a7754de 100644
--- a/src/enums/resources/map/blocktype.h
+++ b/src/enums/resources/map/blocktype.h
@@ -27,12 +27,13 @@
 
 enumStart(BlockType)
 {
-    NONE      = -1,
-    GROUND    = 0,
-    WALL      = 1,
-    AIR       = 2,
-    WATER     = 3,
-    GROUNDTOP = 4,
+    NONE       = -1,
+    GROUND     = 0,
+    WALL       = 1,
+    AIR        = 2,
+    WATER      = 3,
+    GROUNDTOP  = 4,
+    PLAYERWALL = 5,
     NB_BLOCKTYPES
 }
 enumEnd(BlockType);
-- 
cgit v1.2.3-70-g09d2