summaryrefslogtreecommitdiff
path: root/src/being/being.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-08-05 16:07:44 +0300
committerAndrei Karas <akaras@inbox.ru>2014-08-05 16:07:44 +0300
commit8480ff2ce8ac1ce1ceba024eddfaeb62a5d20f8d (patch)
tree5cc8d0097ce680cca550216e2313d1d1cb550cfc /src/being/being.cpp
parent3aaf10f021303dd67a2c36bf23f380348b5bdf02 (diff)
downloadplus-8480ff2ce8ac1ce1ceba024eddfaeb62a5d20f8d.tar.gz
plus-8480ff2ce8ac1ce1ceba024eddfaeb62a5d20f8d.tar.bz2
plus-8480ff2ce8ac1ce1ceba024eddfaeb62a5d20f8d.tar.xz
plus-8480ff2ce8ac1ce1ceba024eddfaeb62a5d20f8d.zip
Rename walkMask into blockWalkMask.
Diffstat (limited to 'src/being/being.cpp')
-rw-r--r--src/being/being.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/being/being.cpp b/src/being/being.cpp
index f45fa4ec8..a47738868 100644
--- a/src/being/being.cpp
+++ b/src/being/being.cpp
@@ -387,7 +387,7 @@ void Being::setDestination(const int dstX, const int dstY)
if (!mMap)
return;
- setPath(mMap->findPath(mX, mY, dstX, dstY, getWalkMask()));
+ setPath(mMap->findPath(mX, mY, dstX, dstY, getBlockWalkMask()));
}
void Being::clearPath()
@@ -1336,7 +1336,7 @@ void Being::nextTile()
if (dir)
setDirection(dir);
- if (!mMap || !mMap->getWalk(pos.x, pos.y, getWalkMask()))
+ if (!mMap || !mMap->getWalk(pos.x, pos.y, getBlockWalkMask()))
{
setAction(BeingAction::STAND, 0);
return;
@@ -1560,25 +1560,25 @@ void Being::petLogic()
}
}
- const unsigned char walkMask = getWalkMask();
- if (!mMap->getWalk(dstX, dstY, walkMask))
+ const unsigned char blockWalkMask = getBlockWalkMask();
+ if (!mMap->getWalk(dstX, dstY, blockWalkMask))
{
if (dstX != dstX0)
{
dstX = dstX0;
- if (!mMap->getWalk(dstX, dstY, walkMask))
+ if (!mMap->getWalk(dstX, dstY, blockWalkMask))
dstY = dstY0;
}
else if (dstY != dstY0)
{
dstY = dstY0;
- if (!mMap->getWalk(dstX, dstY, walkMask))
+ if (!mMap->getWalk(dstX, dstY, blockWalkMask))
dstX = dstX0;
}
}
if (mX != dstX || mY != dstY)
{
- setPath(mMap->findPath(mX, mY, dstX, dstY, walkMask));
+ setPath(mMap->findPath(mX, mY, dstX, dstY, blockWalkMask));
Net::getPetHandler()->move(mOwner, mId, mX, mY, dstX, dstY);
return;
}
@@ -3278,7 +3278,7 @@ void Being::fixPetSpawnPos(int &dstX, int &dstY) const
dstY += offsetY;
if (mMap)
{
- if (!mMap->getWalk(dstX, dstY, getWalkMask()))
+ if (!mMap->getWalk(dstX, dstY, getBlockWalkMask()))
{
dstX = mOwner->getTileX();
dstY = mOwner->getTileY();