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/navigationmanager.cpp | |
| 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/navigationmanager.cpp')
| -rw-r--r-- | src/navigationmanager.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/navigationmanager.cpp b/src/navigationmanager.cpp index 9b164a478..74d0a98df 100644 --- a/src/navigationmanager.cpp +++ b/src/navigationmanager.cpp @@ -26,7 +26,7 @@ #include "debug.h" -static const int walkMask = (BlockMask::WALL | BlockMask::AIR +static const int blockWalkMask = (BlockMask::WALL | BlockMask::AIR | BlockMask::WATER); namespace @@ -89,7 +89,7 @@ bool NavigationManager::findWalkableTile(int &x1, int &y1, for (int x = 0; x < width; x ++) { const int ptr = x + y2; - if (!(tiles[ptr].blockmask & walkMask) && !data[ptr]) + if (!(tiles[ptr].blockmask & blockWalkMask) && !data[ptr]) { x1 = x; y1 = y; @@ -120,7 +120,7 @@ void NavigationManager::fillNum(int x, int y, ptr = (x - 1) + width * y; if (!data[ptr]) { - if (!(tiles[ptr].blockmask & walkMask)) + if (!(tiles[ptr].blockmask & blockWalkMask)) cells.push_back(Cell(x - 1, y)); else data[ptr] = -num; @@ -131,7 +131,7 @@ void NavigationManager::fillNum(int x, int y, ptr = (x + 1) + width * y; if (!data[ptr]) { - if (!(tiles[ptr].blockmask & walkMask)) + if (!(tiles[ptr].blockmask & blockWalkMask)) cells.push_back(Cell(x + 1, y)); else data[ptr] = -num; @@ -142,7 +142,7 @@ void NavigationManager::fillNum(int x, int y, ptr = x + width * (y - 1); if (!data[ptr]) { - if (!(tiles[ptr].blockmask & walkMask)) + if (!(tiles[ptr].blockmask & blockWalkMask)) cells.push_back(Cell(x, y - 1)); else data[ptr] = -num; @@ -153,7 +153,7 @@ void NavigationManager::fillNum(int x, int y, ptr = x + width * (y + 1); if (!data[ptr]) { - if (!(tiles[ptr].blockmask & walkMask)) + if (!(tiles[ptr].blockmask & blockWalkMask)) cells.push_back(Cell(x, y + 1)); else data[ptr] = -num; |