summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-12-16 17:30:24 +0300
committerAndrei Karas <akaras@inbox.ru>2014-12-16 17:30:24 +0300
commit528aa915c7401ab773aba268ec5d0816ab580ea9 (patch)
treefffc728902f8eebf99544b79ca13e32a41c59591
parentbc89a386c9ac61401ee79990151c39069a06e5e0 (diff)
downloadmv-528aa915c7401ab773aba268ec5d0816ab580ea9.tar.gz
mv-528aa915c7401ab773aba268ec5d0816ab580ea9.tar.bz2
mv-528aa915c7401ab773aba268ec5d0816ab580ea9.tar.xz
mv-528aa915c7401ab773aba268ec5d0816ab580ea9.zip
Move processIpResponse from ea namespace into tmwa.
-rw-r--r--src/net/ea/beinghandler.cpp15
-rw-r--r--src/net/ea/beinghandler.h2
-rw-r--r--src/net/tmwa/beinghandler.cpp15
-rw-r--r--src/net/tmwa/beinghandler.h2
4 files changed, 17 insertions, 17 deletions
diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp
index 4ca872196..72bca8015 100644
--- a/src/net/ea/beinghandler.cpp
+++ b/src/net/ea/beinghandler.cpp
@@ -348,21 +348,6 @@ void BeingHandler::processNameResponse(Net::MessageIn &msg)
BLOCK_END("BeingHandler::processNameResponse")
}
-void BeingHandler::processIpResponse(Net::MessageIn &msg)
-{
- BLOCK_START("BeingHandler::processIpResponse")
- if (!actorManager)
- {
- BLOCK_END("BeingHandler::processIpResponse")
- return;
- }
-
- Being *const dstBeing = actorManager->findBeing(msg.readInt32("being id"));
- if (dstBeing)
- dstBeing->setIp(ipToString(msg.readInt32("ip address")));
- BLOCK_END("BeingHandler::processIpResponse")
-}
-
void BeingHandler::processPlayerStop(Net::MessageIn &msg)
{
BLOCK_START("BeingHandler::processPlayerStop")
diff --git a/src/net/ea/beinghandler.h b/src/net/ea/beinghandler.h
index a87117ffe..3bec699d1 100644
--- a/src/net/ea/beinghandler.h
+++ b/src/net/ea/beinghandler.h
@@ -56,8 +56,6 @@ class BeingHandler notfinal : public Net::BeingHandler
static void processNameResponse(Net::MessageIn &msg);
- static void processIpResponse(Net::MessageIn &msg);
-
static void processPlayerStop(Net::MessageIn &msg);
static void processPlayerMoveToAttack(Net::MessageIn &msg);
diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp
index 7f11598c5..113f0708e 100644
--- a/src/net/tmwa/beinghandler.cpp
+++ b/src/net/tmwa/beinghandler.cpp
@@ -1604,4 +1604,19 @@ void BeingHandler::processSkillCastCancel(Net::MessageIn &msg)
msg.readInt32("skill id");
}
+void BeingHandler::processIpResponse(Net::MessageIn &msg)
+{
+ BLOCK_START("BeingHandler::processIpResponse")
+ if (!actorManager)
+ {
+ BLOCK_END("BeingHandler::processIpResponse")
+ return;
+ }
+
+ Being *const dstBeing = actorManager->findBeing(msg.readInt32("being id"));
+ if (dstBeing)
+ dstBeing->setIp(ipToString(msg.readInt32("ip address")));
+ BLOCK_END("BeingHandler::processIpResponse")
+}
+
} // namespace TmwAthena
diff --git a/src/net/tmwa/beinghandler.h b/src/net/tmwa/beinghandler.h
index 24d559b2f..6258b9233 100644
--- a/src/net/tmwa/beinghandler.h
+++ b/src/net/tmwa/beinghandler.h
@@ -92,6 +92,8 @@ class BeingHandler final : public MessageHandler, public Ea::BeingHandler
static void processBeingSelfEffect(Net::MessageIn &msg);
static void processSkillCastCancel(Net::MessageIn &msg);
+
+ static void processIpResponse(Net::MessageIn &msg);
};
} // namespace TmwAthena