summaryrefslogtreecommitdiff
path: root/src/actions
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-09-17 11:34:24 +0300
committerAndrei Karas <akaras@inbox.ru>2014-09-17 11:34:24 +0300
commit8cf91f6df71db6a2c7ca114cc3a7c6666f63c4d0 (patch)
treec55088930bdf1ff0b7fe1f4d6f9219ca6c55e9c9 /src/actions
parent4eaedf092bc504fae492827b1a89e7bbaac20263 (diff)
downloadmanaplus-8cf91f6df71db6a2c7ca114cc3a7c6666f63c4d0.tar.gz
manaplus-8cf91f6df71db6a2c7ca114cc3a7c6666f63c4d0.tar.bz2
manaplus-8cf91f6df71db6a2c7ca114cc3a7c6666f63c4d0.tar.xz
manaplus-8cf91f6df71db6a2c7ca114cc3a7c6666f63c4d0.zip
Remove getter for playerHandler.
Diffstat (limited to 'src/actions')
-rw-r--r--src/actions/actions.cpp2
-rw-r--r--src/actions/move.cpp16
2 files changed, 9 insertions, 9 deletions
diff --git a/src/actions/actions.cpp b/src/actions/actions.cpp
index 6c8c49ca6..b857f0f10 100644
--- a/src/actions/actions.cpp
+++ b/src/actions/actions.cpp
@@ -347,7 +347,7 @@ impHandler0(itenplz)
{
if (actorManager)
{
- if (Net::getPlayerHandler() && Net::getPlayerHandler()->canUseMagic()
+ if (playerHandler && playerHandler->canUseMagic()
&& PlayerInfo::getAttribute(Attributes::MP) >= 3)
{
actorManager->itenplz();
diff --git a/src/actions/move.cpp b/src/actions/move.cpp
index 28b51cfe2..cc4c27b6c 100644
--- a/src/actions/move.cpp
+++ b/src/actions/move.cpp
@@ -160,8 +160,8 @@ impHandler0(directUp)
// if (PacketLimiter::limitPackets(PACKET_DIRECTION))
{
localPlayer->setDirection(BeingDirection::UP);
- if (Net::getPlayerHandler())
- Net::getPlayerHandler()->setDirection(BeingDirection::UP);
+ if (playerHandler)
+ playerHandler->setDirection(BeingDirection::UP);
}
}
return true;
@@ -178,9 +178,9 @@ impHandler0(directDown)
// if (PacketLimiter::limitPackets(PACKET_DIRECTION))
{
localPlayer->setDirection(BeingDirection::DOWN);
- if (Net::getPlayerHandler())
+ if (playerHandler)
{
- Net::getPlayerHandler()->setDirection(
+ playerHandler->setDirection(
BeingDirection::DOWN);
}
}
@@ -199,9 +199,9 @@ impHandler0(directLeft)
// if (PacketLimiter::limitPackets(PACKET_DIRECTION))
{
localPlayer->setDirection(BeingDirection::LEFT);
- if (Net::getPlayerHandler())
+ if (playerHandler)
{
- Net::getPlayerHandler()->setDirection(
+ playerHandler->setDirection(
BeingDirection::LEFT);
}
}
@@ -220,9 +220,9 @@ impHandler0(directRight)
// if (PacketLimiter::limitPackets(PACKET_DIRECTION))
{
localPlayer->setDirection(BeingDirection::RIGHT);
- if (Net::getPlayerHandler())
+ if (playerHandler)
{
- Net::getPlayerHandler()->setDirection(
+ playerHandler->setDirection(
BeingDirection::RIGHT);
}
}