summaryrefslogtreecommitdiff
path: root/src/enums
diff options
context:
space:
mode:
Diffstat (limited to 'src/enums')
-rw-r--r--src/enums/gui/usercolorid.h1
-rw-r--r--src/enums/resources/map/blockmask.h13
-rw-r--r--src/enums/resources/map/blocktype.h15
3 files changed, 16 insertions, 13 deletions
diff --git a/src/enums/gui/usercolorid.h b/src/enums/gui/usercolorid.h
index 3da13ea42..31be98e43 100644
--- a/src/enums/gui/usercolorid.h
+++ b/src/enums/gui/usercolorid.h
@@ -79,6 +79,7 @@ enumStart(UserColorId)
COLLISION_HIGHLIGHT,
AIR_COLLISION_HIGHLIGHT,
WATER_COLLISION_HIGHLIGHT,
+ MONSTER_COLLISION_HIGHLIGHT,
GROUNDTOP_COLLISION_HIGHLIGHT,
WALKABLE_HIGHLIGHT,
NET,
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);