summaryrefslogtreecommitdiff
path: root/src/being
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-09-17 11:24:41 +0300
committerAndrei Karas <akaras@inbox.ru>2014-09-17 11:24:41 +0300
commit4eaedf092bc504fae492827b1a89e7bbaac20263 (patch)
tree098d1b1a7721606a8c053dc56f9e9765b8072c9e /src/being
parent418d749f0d4889904d0b91e825a87e70a08d134c (diff)
downloadmv-4eaedf092bc504fae492827b1a89e7bbaac20263.tar.gz
mv-4eaedf092bc504fae492827b1a89e7bbaac20263.tar.bz2
mv-4eaedf092bc504fae492827b1a89e7bbaac20263.tar.xz
mv-4eaedf092bc504fae492827b1a89e7bbaac20263.zip
Remove getter for petHandler.
Diffstat (limited to 'src/being')
-rw-r--r--src/being/being.cpp6
-rw-r--r--src/being/localplayer.cpp2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/being/being.cpp b/src/being/being.cpp
index 6ad8f5a9b..303e9f8f9 100644
--- a/src/being/being.cpp
+++ b/src/being/being.cpp
@@ -1520,7 +1520,7 @@ void Being::petLogic()
setAction(BeingAction::STAND, 0);
fixPetSpawnPos(dstX, dstY);
setTileCoords(dstX, dstY);
- Net::getPetHandler()->spawn(mOwner, mId, dstX, dstY);
+ petHandler->spawn(mOwner, mId, dstX, dstY);
}
else if (!followDist || divX > followDist || divY > followDist)
{
@@ -1573,7 +1573,7 @@ void Being::petLogic()
if (mX != dstX || mY != dstY)
{
setPath(mMap->findPath(mX, mY, dstX, dstY, blockWalkMask));
- Net::getPetHandler()->move(mOwner, mId, mX, mY, dstX, dstY);
+ petHandler->move(mOwner, mId, mX, mY, dstX, dstY);
return;
}
}
@@ -3137,7 +3137,7 @@ void Being::addPet(const int id)
int dstY = mY;
being->fixPetSpawnPos(dstX, dstY);
being->setTileCoords(dstX, dstY);
- Net::getPetHandler()->spawn(this, being->mId, dstX, dstY);
+ petHandler->spawn(this, being->mId, dstX, dstY);
}
}
diff --git a/src/being/localplayer.cpp b/src/being/localplayer.cpp
index f01a3171a..a97d56128 100644
--- a/src/being/localplayer.cpp
+++ b/src/being/localplayer.cpp
@@ -1963,7 +1963,7 @@ void LocalPlayer::crazyMoveA()
if (mMoveProgram[mCrazyMoveState - 1] == 'e')
emote(emoteId);
else if (PacketLimiter::limitPackets(PACKET_CHAT))
- Net::getPetHandler()->emote(emoteId, 0);
+ petHandler->emote(emoteId, 0);
mCrazyMoveState ++;
}