summaryrefslogtreecommitdiff
path: root/src/enums/resources
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-08-07 18:23:39 +0300
committerAndrei Karas <akaras@inbox.ru>2016-08-07 18:23:39 +0300
commitb1753d59caa299c668b9c269e87f96c46e0ab33a (patch)
treed333a7de5b6e9ddde85540d5b5a87eabd747fac1 /src/enums/resources
parent1740b281aa32ba2c30a2a6203f7748af6a21fd39 (diff)
downloadmv-b1753d59caa299c668b9c269e87f96c46e0ab33a.tar.gz
mv-b1753d59caa299c668b9c269e87f96c46e0ab33a.tar.bz2
mv-b1753d59caa299c668b9c269e87f96c46e0ab33a.tar.xz
mv-b1753d59caa299c668b9c269e87f96c46e0ab33a.zip
Add player wall collision type (5).
Diffstat (limited to 'src/enums/resources')
-rw-r--r--src/enums/resources/map/blockmask.h11
-rw-r--r--src/enums/resources/map/blocktype.h13
2 files changed, 13 insertions, 11 deletions
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);