summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-10-17 15:57:43 +0300
committerAndrei Karas <akaras@inbox.ru>2014-10-17 15:57:43 +0300
commit1c2b548e4bc8cd7243cd61bed6c68db859d843db (patch)
treee9bd0141f6880fac7ae322a29716fd07798f40b8
parent418819595294569be3e2c09b49868e94d66c5de6 (diff)
downloadmv-1c2b548e4bc8cd7243cd61bed6c68db859d843db.tar.gz
mv-1c2b548e4bc8cd7243cd61bed6c68db859d843db.tar.bz2
mv-1c2b548e4bc8cd7243cd61bed6c68db859d843db.tar.xz
mv-1c2b548e4bc8cd7243cd61bed6c68db859d843db.zip
Add static in familyhandler.
-rw-r--r--src/net/eathena/familyhandler.cpp10
-rw-r--r--src/net/eathena/familyhandler.h10
2 files changed, 12 insertions, 8 deletions
diff --git a/src/net/eathena/familyhandler.cpp b/src/net/eathena/familyhandler.cpp
index 950762573..e3df97f4f 100644
--- a/src/net/eathena/familyhandler.cpp
+++ b/src/net/eathena/familyhandler.cpp
@@ -32,11 +32,15 @@ extern Net::FamilyHandler *familyHandler;
namespace EAthena
{
+int FamilyHandler::mParent1 = 0;
+int FamilyHandler::mParent2 = 0;
+
FamilyHandler::FamilyHandler() :
- MessageHandler(),
- mParent1(0),
- mParent2(0)
+ MessageHandler()
{
+ mParent1 = 0;
+ mParent2 = 0;
+
static const uint16_t _messages[] =
{
SMSG_FAMILY_ASK_FOR_CHILD,
diff --git a/src/net/eathena/familyhandler.h b/src/net/eathena/familyhandler.h
index e2c5be154..8fe4716d0 100644
--- a/src/net/eathena/familyhandler.h
+++ b/src/net/eathena/familyhandler.h
@@ -42,15 +42,15 @@ class FamilyHandler final : public MessageHandler,
void askForChildReply(const bool accept) override final;
protected:
- void processAskForChild(Net::MessageIn &msg);
+ static void processAskForChild(Net::MessageIn &msg);
- void processCallPartner(Net::MessageIn &msg);
+ static void processCallPartner(Net::MessageIn &msg);
- void processDivorced(Net::MessageIn &msg);
+ static void processDivorced(Net::MessageIn &msg);
private:
- int mParent1;
- int mParent2;
+ static int mParent1;
+ static int mParent2;
};
} // namespace EAthena