diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-08-05 16:07:44 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-08-05 16:07:44 +0300 |
| commit | 8480ff2ce8ac1ce1ceba024eddfaeb62a5d20f8d (patch) | |
| tree | 5cc8d0097ce680cca550216e2313d1d1cb550cfc /src/resources/map/map.h | |
| parent | 3aaf10f021303dd67a2c36bf23f380348b5bdf02 (diff) | |
| download | manaplus-8480ff2ce8ac1ce1ceba024eddfaeb62a5d20f8d.tar.gz manaplus-8480ff2ce8ac1ce1ceba024eddfaeb62a5d20f8d.tar.bz2 manaplus-8480ff2ce8ac1ce1ceba024eddfaeb62a5d20f8d.tar.xz manaplus-8480ff2ce8ac1ce1ceba024eddfaeb62a5d20f8d.zip | |
Rename walkMask into blockWalkMask.
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 21976d38a..2026500ad 100644 --- a/src/resources/map/map.h +++ b/src/resources/map/map.h @@ -150,7 +150,7 @@ class Map final : public Properties, public ConfigListener * without walkmask, only blocks against colliding tiles. */ bool getWalk(const int x, const int y, - const unsigned char walkmask = BlockMask::WALL + const unsigned char blockWalkMask = BlockMask::WALL | BlockMask::AIR | BlockMask::WATER) const A_WARN_UNUSED; void setWalk(const int x, const int y, const bool walkable); @@ -197,7 +197,7 @@ class Map final : public Properties, public ConfigListener */ Path findPath(const int startX, const int startY, const int destX, const int destY, - const unsigned char walkmask, + const unsigned char blockWalkmask, const int maxCost = 20) A_WARN_UNUSED; /** |