summaryrefslogtreecommitdiff
path: root/src/map.h
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-04-14 17:06:02 +0300
committerAndrei Karas <akaras@inbox.ru>2013-04-14 17:06:02 +0300
commit6b5c7e7a5ed32abfc98d9acdebacc50c68a91a1d (patch)
treef1acb027394af1aec49790354df97da4665488b7 /src/map.h
parenta7d7346b9eb3fa62a8912e31d5c00f8e05390425 (diff)
downloadmv-6b5c7e7a5ed32abfc98d9acdebacc50c68a91a1d.tar.gz
mv-6b5c7e7a5ed32abfc98d9acdebacc50c68a91a1d.tar.bz2
mv-6b5c7e7a5ed32abfc98d9acdebacc50c68a91a1d.tar.xz
mv-6b5c7e7a5ed32abfc98d9acdebacc50c68a91a1d.zip
another fixes from cpplint.
Diffstat (limited to 'src/map.h')
-rw-r--r--src/map.h15
1 files changed, 7 insertions, 8 deletions
diff --git a/src/map.h b/src/map.h
index 4bfdb56fb..07354623d 100644
--- a/src/map.h
+++ b/src/map.h
@@ -136,13 +136,13 @@ class Map final : public Properties, public ConfigListener
enum BlockMask
{
- BLOCKMASK_WALL = 0x80, // 1000 0000
- BLOCKMASK_CHARACTER = 0x01, // 0000 0001
- BLOCKMASK_MONSTER = 0x02, // 0000 0010
- BLOCKMASK_AIR = 0x04, // 0000 0100
- BLOCKMASK_WATER = 0x08, // 0000 1000
- BLOCKMASK_GROUND = 0x10, // 0001 0000
- BLOCKMASK_GROUNDTOP = 0x20 // 0010 0000
+ BLOCKMASK_WALL = 0x80, // 1000 0000
+ BLOCKMASK_CHARACTER = 0x01, // 0000 0001
+ BLOCKMASK_MONSTER = 0x02, // 0000 0010
+ BLOCKMASK_AIR = 0x04, // 0000 0100
+ BLOCKMASK_WATER = 0x08, // 0000 1000
+ BLOCKMASK_GROUND = 0x10, // 0001 0000
+ BLOCKMASK_GROUNDTOP = 0x20 // 0010 0000
};
enum DebugType
@@ -429,7 +429,6 @@ class Map final : public Properties, public ConfigListener
void removeActor(const Actors::iterator &iterator);
private:
-
enum LayerType
{
FOREGROUND_LAYERS = 0,