summaryrefslogtreecommitdiff
path: root/src/being
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-12-22 01:28:56 +0300
committerAndrei Karas <akaras@inbox.ru>2017-12-22 01:28:56 +0300
commitcc7a39f467a49b2e91717739cb6e7c3c4b34a245 (patch)
treeb930d808b5782b77dfa7cd52bbaa902101b8ba06 /src/being
parent2e07d1c5eb79eb291c20da511d0a313f56690756 (diff)
downloadplus-cc7a39f467a49b2e91717739cb6e7c3c4b34a245.tar.gz
plus-cc7a39f467a49b2e91717739cb6e7c3c4b34a245.tar.bz2
plus-cc7a39f467a49b2e91717739cb6e7c3c4b34a245.tar.xz
plus-cc7a39f467a49b2e91717739cb6e7c3c4b34a245.zip
Remove default parameters from map.
Diffstat (limited to 'src/being')
-rw-r--r--src/being/being.cpp7
-rw-r--r--src/being/localplayer.cpp20
2 files changed, 21 insertions, 6 deletions
diff --git a/src/being/being.cpp b/src/being/being.cpp
index 1e8ca5efc..ad68a4657 100644
--- a/src/being/being.cpp
+++ b/src/being/being.cpp
@@ -543,7 +543,12 @@ void Being::setDestination(const int dstX,
if (mMap == nullptr)
return;
- setPath(mMap->findPath(mX, mY, dstX, dstY, getBlockWalkMask()));
+ setPath(mMap->findPath(mX,
+ mY,
+ dstX,
+ dstY,
+ getBlockWalkMask(),
+ 20));
}
void Being::clearPath() restrict2
diff --git a/src/being/localplayer.cpp b/src/being/localplayer.cpp
index d336c0e00..135dce434 100644
--- a/src/being/localplayer.cpp
+++ b/src/being/localplayer.cpp
@@ -1833,8 +1833,11 @@ void LocalPlayer::setHome()
if (iter != mHomes.end() && mX == CAST_S32(pos.x)
&& mY == CAST_S32(pos.y))
{
- mMap->updatePortalTile("", MapItemType::EMPTY,
- CAST_S32(pos.x), CAST_S32(pos.y));
+ mMap->updatePortalTile("",
+ MapItemType::EMPTY,
+ CAST_S32(pos.x),
+ CAST_S32(pos.y),
+ true);
mHomes.erase(key);
socialWindow->removePortal(CAST_S32(pos.x),
@@ -1852,8 +1855,11 @@ void LocalPlayer::setHome()
pos.x = static_cast<float>(mX);
pos.y = static_cast<float>(mY);
mHomes[key] = pos;
- mMap->updatePortalTile("home", MapItemType::HOME,
- mX, mY);
+ mMap->updatePortalTile("home",
+ MapItemType::HOME,
+ mX,
+ mY,
+ true);
socialWindow->addPortal(mX, mY);
}
MapItem *const mapItem = specialLayer->getTile(mX, mY);
@@ -1892,7 +1898,11 @@ void LocalPlayer::setHome()
{
type = MapItemType::EMPTY;
}
- mMap->updatePortalTile("", type, mX, mY);
+ mMap->updatePortalTile("",
+ type,
+ mX,
+ mY,
+ true);
if (type != MapItemType::EMPTY)
{