summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-09-05 13:17:59 +0300
committerAndrei Karas <akaras@inbox.ru>2014-09-06 01:18:57 +0300
commit256d936b71d500fc14ee52c7f55959fc65b289ac (patch)
tree3ea681387225bfa5c94e251d86ba48ae5afbfb18 /src/net
parent07d993ed7cfa78bc5316bfb5b3ab27158925326a (diff)
downloadmv-256d936b71d500fc14ee52c7f55959fc65b289ac.tar.gz
mv-256d936b71d500fc14ee52c7f55959fc65b289ac.tar.bz2
mv-256d936b71d500fc14ee52c7f55959fc65b289ac.tar.xz
mv-256d936b71d500fc14ee52c7f55959fc65b289ac.zip
Move processBeingStatusChange from ea namespace into eathena and tmwa.
Diffstat (limited to 'src/net')
-rw-r--r--src/net/ea/beinghandler.cpp20
-rw-r--r--src/net/ea/beinghandler.h2
-rw-r--r--src/net/eathena/beinghandler.cpp20
-rw-r--r--src/net/eathena/beinghandler.h2
-rw-r--r--src/net/tmwa/beinghandler.cpp20
-rw-r--r--src/net/tmwa/beinghandler.h2
6 files changed, 44 insertions, 22 deletions
diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp
index 606831cc3..3da2ffd02 100644
--- a/src/net/ea/beinghandler.cpp
+++ b/src/net/ea/beinghandler.cpp
@@ -581,26 +581,6 @@ void BeingHandler::processPlaterStatusChange(Net::MessageIn &msg) const
BLOCK_END("BeingHandler::processPlayerStop")
}
-void BeingHandler::processBeingStatusChange(Net::MessageIn &msg) const
-{
- BLOCK_START("BeingHandler::processBeingStatusChange")
- if (!actorManager)
- {
- BLOCK_END("BeingHandler::processBeingStatusChange")
- return;
- }
-
- // Status change
- const uint16_t status = msg.readInt16("status");
- const int id = msg.readInt32("being id");
- const bool flag = msg.readUInt8("flag: 0: stop, 1: start");
-
- Being *const dstBeing = actorManager->findBeing(id);
- if (dstBeing)
- dstBeing->setStatusEffect(status, flag);
- BLOCK_END("BeingHandler::processBeingStatusChange")
-}
-
void BeingHandler::processSkillNoDamage(Net::MessageIn &msg) const
{
msg.readInt16("skill id");
diff --git a/src/net/ea/beinghandler.h b/src/net/ea/beinghandler.h
index a2c699bc4..4405f1975 100644
--- a/src/net/ea/beinghandler.h
+++ b/src/net/ea/beinghandler.h
@@ -74,8 +74,6 @@ class BeingHandler notfinal : public Net::BeingHandler
virtual void processPlaterStatusChange(Net::MessageIn &msg) const;
- virtual void processBeingStatusChange(Net::MessageIn &msg) const;
-
virtual void processSkillNoDamage(Net::MessageIn &msg) const;
virtual void processPvpMapMode(Net::MessageIn &msg) const;
diff --git a/src/net/eathena/beinghandler.cpp b/src/net/eathena/beinghandler.cpp
index a5f39635c..d0b76685b 100644
--- a/src/net/eathena/beinghandler.cpp
+++ b/src/net/eathena/beinghandler.cpp
@@ -885,4 +885,24 @@ void BeingHandler::processSkillCasting(Net::MessageIn &msg) const
msg.readInt8("dispossable");
}
+void BeingHandler::processBeingStatusChange(Net::MessageIn &msg) const
+{
+ BLOCK_START("BeingHandler::processBeingStatusChange")
+ if (!actorManager)
+ {
+ BLOCK_END("BeingHandler::processBeingStatusChange")
+ return;
+ }
+
+ // Status change
+ const uint16_t status = msg.readInt16("status");
+ const int id = msg.readInt32("being id");
+ const bool flag = msg.readUInt8("flag: 0: stop, 1: start");
+
+ Being *const dstBeing = actorManager->findBeing(id);
+ if (dstBeing)
+ dstBeing->setStatusEffect(status, flag);
+ BLOCK_END("BeingHandler::processBeingStatusChange")
+}
+
} // namespace EAthena
diff --git a/src/net/eathena/beinghandler.h b/src/net/eathena/beinghandler.h
index d100745f8..aea778d5c 100644
--- a/src/net/eathena/beinghandler.h
+++ b/src/net/eathena/beinghandler.h
@@ -55,6 +55,8 @@ class BeingHandler final : public MessageHandler, public Ea::BeingHandler
void processMapTypeProperty(Net::MessageIn &msg) const;
void processSkillCasting(Net::MessageIn &msg) const;
+
+ void processBeingStatusChange(Net::MessageIn &msg) const;
};
} // namespace EAthena
diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp
index af71491d3..426ed7a24 100644
--- a/src/net/tmwa/beinghandler.cpp
+++ b/src/net/tmwa/beinghandler.cpp
@@ -999,4 +999,24 @@ void BeingHandler::processSkillCasting(Net::MessageIn &msg) const
msg.readInt32("cast time");
}
+void BeingHandler::processBeingStatusChange(Net::MessageIn &msg) const
+{
+ BLOCK_START("BeingHandler::processBeingStatusChange")
+ if (!actorManager)
+ {
+ BLOCK_END("BeingHandler::processBeingStatusChange")
+ return;
+ }
+
+ // Status change
+ const uint16_t status = msg.readInt16("status");
+ const int id = msg.readInt32("being id");
+ const bool flag = msg.readUInt8("flag: 0: stop, 1: start");
+
+ Being *const dstBeing = actorManager->findBeing(id);
+ if (dstBeing)
+ dstBeing->setStatusEffect(status, flag);
+ BLOCK_END("BeingHandler::processBeingStatusChange")
+}
+
} // namespace TmwAthena
diff --git a/src/net/tmwa/beinghandler.h b/src/net/tmwa/beinghandler.h
index fb7fd872d..af7004fd5 100644
--- a/src/net/tmwa/beinghandler.h
+++ b/src/net/tmwa/beinghandler.h
@@ -57,6 +57,8 @@ class BeingHandler final : public MessageHandler, public Ea::BeingHandler
void processBeingSpawn(Net::MessageIn &msg);
void processSkillCasting(Net::MessageIn &msg) const;
+
+ void processBeingStatusChange(Net::MessageIn &msg) const;
};
} // namespace TmwAthena