summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-06-16 16:54:10 +0300
committerAndrei Karas <akaras@inbox.ru>2015-06-16 16:54:10 +0300
commit2b3b773d1b902eb0797e2d9fc034d63559af87a3 (patch)
tree58749facbde590e8658e75c56825b0a9b703fcd6
parentbb58d4020ff5d8ade0fec58d3e311ac211c262ef (diff)
downloadplus-2b3b773d1b902eb0797e2d9fc034d63559af87a3.tar.gz
plus-2b3b773d1b902eb0797e2d9fc034d63559af87a3.tar.bz2
plus-2b3b773d1b902eb0797e2d9fc034d63559af87a3.tar.xz
plus-2b3b773d1b902eb0797e2d9fc034d63559af87a3.zip
Move processPvpSet from ea namespace into eathena and tmwa.
-rw-r--r--src/net/ea/beinghandler.cpp15
-rw-r--r--src/net/ea/beinghandler.h2
-rw-r--r--src/net/eathena/beinghandler.cpp15
-rw-r--r--src/net/eathena/beinghandler.h2
-rw-r--r--src/net/tmwa/beinghandler.cpp15
-rw-r--r--src/net/tmwa/beinghandler.h2
6 files changed, 34 insertions, 17 deletions
diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp
index 0c4a83b42..c86414022 100644
--- a/src/net/ea/beinghandler.cpp
+++ b/src/net/ea/beinghandler.cpp
@@ -418,21 +418,6 @@ void BeingHandler::processPvpMapMode(Net::MessageIn &msg)
BLOCK_END("BeingHandler::processPvpMapMode")
}
-void BeingHandler::processPvpSet(Net::MessageIn &msg)
-{
- BLOCK_START("BeingHandler::processPvpSet")
- const BeingId id = msg.readBeingId("being id");
- const int rank = msg.readInt32("rank");
- msg.readInt32("num");
- if (actorManager)
- {
- Being *const dstBeing = actorManager->findBeing(id);
- if (dstBeing)
- dstBeing->setPvpRank(rank);
- }
- BLOCK_END("BeingHandler::processPvpSet")
-}
-
void BeingHandler::processNameResponse2(Net::MessageIn &msg)
{
BLOCK_START("BeingHandler::processNameResponse2")
diff --git a/src/net/ea/beinghandler.h b/src/net/ea/beinghandler.h
index 55e4a3ef2..b5a4768fc 100644
--- a/src/net/ea/beinghandler.h
+++ b/src/net/ea/beinghandler.h
@@ -64,8 +64,6 @@ class BeingHandler notfinal : public Net::BeingHandler
static void processPvpMapMode(Net::MessageIn &msg);
- static void processPvpSet(Net::MessageIn &msg);
-
static void processNameResponse2(Net::MessageIn &msg);
static void processBeingMove3(Net::MessageIn &msg);
diff --git a/src/net/eathena/beinghandler.cpp b/src/net/eathena/beinghandler.cpp
index ff12a909d..4ab060b9a 100644
--- a/src/net/eathena/beinghandler.cpp
+++ b/src/net/eathena/beinghandler.cpp
@@ -1950,4 +1950,19 @@ void BeingHandler::processBeingViewEquipment(Net::MessageIn &msg)
}
}
+void BeingHandler::processPvpSet(Net::MessageIn &msg)
+{
+ BLOCK_START("BeingHandler::processPvpSet")
+ const BeingId id = msg.readBeingId("being id");
+ const int rank = msg.readInt32("rank");
+ msg.readInt32("num");
+ if (actorManager)
+ {
+ Being *const dstBeing = actorManager->findBeing(id);
+ if (dstBeing)
+ dstBeing->setPvpRank(rank);
+ }
+ BLOCK_END("BeingHandler::processPvpSet")
+}
+
} // namespace EAthena
diff --git a/src/net/eathena/beinghandler.h b/src/net/eathena/beinghandler.h
index 0e26b84a7..4a88d376f 100644
--- a/src/net/eathena/beinghandler.h
+++ b/src/net/eathena/beinghandler.h
@@ -163,6 +163,8 @@ class BeingHandler final : public MessageHandler, public Ea::BeingHandler
static void processBeingCharm(Net::MessageIn &msg);
static void processBeingViewEquipment(Net::MessageIn &msg);
+
+ static void processPvpSet(Net::MessageIn &msg);
};
} // namespace EAthena
diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp
index a9b324b1e..b57269f32 100644
--- a/src/net/tmwa/beinghandler.cpp
+++ b/src/net/tmwa/beinghandler.cpp
@@ -1608,4 +1608,19 @@ void BeingHandler::processIpResponse(Net::MessageIn &msg)
BLOCK_END("BeingHandler::processIpResponse")
}
+void BeingHandler::processPvpSet(Net::MessageIn &msg)
+{
+ BLOCK_START("BeingHandler::processPvpSet")
+ const BeingId id = msg.readBeingId("being id");
+ const int rank = msg.readInt32("rank");
+ msg.readInt32("num");
+ if (actorManager)
+ {
+ Being *const dstBeing = actorManager->findBeing(id);
+ if (dstBeing)
+ dstBeing->setPvpRank(rank);
+ }
+ BLOCK_END("BeingHandler::processPvpSet")
+}
+
} // namespace TmwAthena
diff --git a/src/net/tmwa/beinghandler.h b/src/net/tmwa/beinghandler.h
index 2a65c70c0..7d78b5d33 100644
--- a/src/net/tmwa/beinghandler.h
+++ b/src/net/tmwa/beinghandler.h
@@ -98,6 +98,8 @@ class BeingHandler final : public MessageHandler, public Ea::BeingHandler
static void processSkillCastCancel(Net::MessageIn &msg);
static void processIpResponse(Net::MessageIn &msg);
+
+ static void processPvpSet(Net::MessageIn &msg);
};
} // namespace TmwAthena