diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-10-15 21:14:04 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-10-15 21:14:04 +0300 |
| commit | 7b89705cc5c491b60dab923e2f8079cfc1f4bce1 (patch) | |
| tree | a3a5ceb5a142b9b954eab23c39946b0825218169 /src/resources/map/map.h | |
| parent | 8b22861c92f1cec3af31b8b9e97b16498b2d86d0 (diff) | |
| download | manaplus-7b89705cc5c491b60dab923e2f8079cfc1f4bce1.tar.gz manaplus-7b89705cc5c491b60dab923e2f8079cfc1f4bce1.tar.bz2 manaplus-7b89705cc5c491b60dab923e2f8079cfc1f4bce1.tar.xz manaplus-7b89705cc5c491b60dab923e2f8079cfc1f4bce1.zip | |
Convert BlockType into strong typed enum.
Diffstat (limited to 'src/resources/map/map.h')
| -rw-r--r-- | src/resources/map/map.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/resources/map/map.h b/src/resources/map/map.h index 33b819c04..49e0459f2 100644 --- a/src/resources/map/map.h +++ b/src/resources/map/map.h @@ -146,7 +146,7 @@ class Map final : public Properties, public ConfigListener * Marks a tile as occupied. */ void blockTile(const int x, const int y, - const BlockType::BlockType type); + const BlockTypeT type); /** * Gets walkability for a tile with a blocking bitmask. When called @@ -378,7 +378,7 @@ class Map final : public Properties, public ConfigListener /** * Blockmasks for different entities */ - unsigned *mOccupation[BlockType::NB_BLOCKTYPES]; + unsigned *mOccupation[static_cast<size_t>(BlockType::NB_BLOCKTYPES)]; const int mWidth; const int mHeight; |