diff options
| author | Andrei Karas <akaras@inbox.ru> | 2013-04-14 17:06:02 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2013-04-14 17:06:02 +0300 |
| commit | 6b5c7e7a5ed32abfc98d9acdebacc50c68a91a1d (patch) | |
| tree | f1acb027394af1aec49790354df97da4665488b7 /src/map.h | |
| parent | a7d7346b9eb3fa62a8912e31d5c00f8e05390425 (diff) | |
| download | manaplus-6b5c7e7a5ed32abfc98d9acdebacc50c68a91a1d.tar.gz manaplus-6b5c7e7a5ed32abfc98d9acdebacc50c68a91a1d.tar.bz2 manaplus-6b5c7e7a5ed32abfc98d9acdebacc50c68a91a1d.tar.xz manaplus-6b5c7e7a5ed32abfc98d9acdebacc50c68a91a1d.zip | |
another fixes from cpplint.
Diffstat (limited to 'src/map.h')
| -rw-r--r-- | src/map.h | 15 |
1 files changed, 7 insertions, 8 deletions
@@ -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, |