10 files changed, 245 insertions, 2 deletions
diff --git a/src/net/eathena/generalhandler.cpp b/src/net/eathena/generalhandler.cpp
index 9ea481f2c..12b63a56d 100644
--- a/src/net/eathena/generalhandler.cpp
+++ b/src/net/eathena/generalhandler.cpp
@@ -54,6 +54,7 @@
 #include "net/eathena/itemhandler.h"
 #include "net/eathena/loginhandler.h"
 #include "net/eathena/mailhandler.h"
+#include "net/eathena/mercenaryhandler.h"
 #include "net/eathena/network.h"
 #include "net/eathena/npchandler.h"
 #include "net/eathena/partyhandler.h"
@@ -104,7 +105,8 @@ GeneralHandler::GeneralHandler() :
     mAuctionHandler(new AuctionHandler),
     mCashShopHandler(new CashShopHandler),
     mFamilyHandler(new FamilyHandler),
-    mBankHandler(new BankHandler)
+    mBankHandler(new BankHandler),
+    mMercenaryHandler(new MercenaryHandler)
 {
     static const uint16_t _messages[] =
     {
@@ -207,6 +209,7 @@ void GeneralHandler::load()
     mNetwork->registerHandler(mCashShopHandler);
     mNetwork->registerHandler(mFamilyHandler);
     mNetwork->registerHandler(mBankHandler);
+    mNetwork->registerHandler(mMercenaryHandler);
 }
 
 void GeneralHandler::reload()
diff --git a/src/net/eathena/generalhandler.h b/src/net/eathena/generalhandler.h
index d6b73c828..a4e46692f 100644
--- a/src/net/eathena/generalhandler.h
+++ b/src/net/eathena/generalhandler.h
@@ -84,6 +84,7 @@ class GeneralHandler final : public MessageHandler,
         MessageHandlerPtr mCashShopHandler;
         MessageHandlerPtr mFamilyHandler;
         MessageHandlerPtr mBankHandler;
+        MessageHandlerPtr mMercenaryHandler;
 };
 
 }  // namespace EAthena
diff --git a/src/net/eathena/mercenaryhandler.cpp b/src/net/eathena/mercenaryhandler.cpp
new file mode 100644
index 000000000..a6ca9a1ab
--- /dev/null
+++ b/src/net/eathena/mercenaryhandler.cpp
@@ -0,0 +1,57 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2011-2014  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "net/eathena/mercenaryhandler.h"
+
+#include "logger.h"
+
+#include "net/ea/eaprotocol.h"
+
+#include "net/eathena/messageout.h"
+#include "net/eathena/protocol.h"
+
+#include "debug.h"
+
+extern Net::MercenaryHandler *mercenaryHandler;
+
+namespace EAthena
+{
+
+MercenaryHandler::MercenaryHandler() :
+    MessageHandler()
+{
+    static const uint16_t _messages[] =
+    {
+        0
+    };
+    handledMessages = _messages;
+    mercenaryHandler = this;
+}
+
+void MercenaryHandler::handleMessage(Net::MessageIn &msg)
+{
+    switch (msg.getId())
+    {
+        default:
+            break;
+    }
+}
+
+}  // namespace EAthena
diff --git a/src/net/eathena/mercenaryhandler.h b/src/net/eathena/mercenaryhandler.h
new file mode 100644
index 000000000..bd91fa37b
--- /dev/null
+++ b/src/net/eathena/mercenaryhandler.h
@@ -0,0 +1,45 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2011-2014  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef NET_EATHENA_MERCENARYHANDLER_H
+#define NET_EATHENA_MERCENARYHANDLER_H
+
+#include "net/mercenaryhandler.h"
+
+#include "net/eathena/messagehandler.h"
+
+namespace EAthena
+{
+class MessageOut;
+
+class MercenaryHandler final : public MessageHandler,
+                               public Net::MercenaryHandler
+{
+    public:
+        MercenaryHandler();
+
+        A_DELETE_COPY(MercenaryHandler)
+
+        void handleMessage(Net::MessageIn &msg) override final;
+};
+
+}  // namespace EAthena
+
+#endif  // NET_EATHENA_MERCENARYHANDLER_H
diff --git a/src/net/mercenaryhandler.h b/src/net/mercenaryhandler.h
new file mode 100644
index 000000000..55ad14818
--- /dev/null
+++ b/src/net/mercenaryhandler.h
@@ -0,0 +1,42 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2011-2014  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef NET_MECENARYHANDLER_H
+#define NET_MECENARYHANDLER_H
+
+#include <string>
+
+#include "localconsts.h"
+
+namespace Net
+{
+
+class MercenaryHandler notfinal
+{
+    public:
+        virtual ~MercenaryHandler()
+        { }
+};
+
+}  // namespace Net
+
+extern Net::MercenaryHandler *mercenaryHandler;
+
+#endif  // NET_MECENARYHANDLER_H
diff --git a/src/net/net.cpp b/src/net/net.cpp
index 3aba48940..69a48f400 100644
--- a/src/net/net.cpp
+++ b/src/net/net.cpp
@@ -57,6 +57,7 @@ namespace Net
     class InventoryHandler;
     class LoginHandler;
     class MailHandler;
+    class MercenaryHandler;
     class NpcHandler;
     class PartyHandler;
     class PetHandler;
@@ -85,6 +86,7 @@ Net::BeingHandler *beingHandler = nullptr;
 Net::BuySellHandler *buySellHandler = nullptr;
 Net::ServerFeatures *serverFeatures = nullptr;
 Net::MailHandler *mailHandler = nullptr;
+Net::MercenaryHandler *mercenaryHandler = nullptr;
 Net::AuctionHandler *auctionHandler = nullptr;
 Net::CashShopHandler *cashShopHandler = nullptr;
 Net::FamilyHandler *familyHandler = nullptr;
diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp
index 90fd3ad79..800148a41 100644
--- a/src/net/tmwa/generalhandler.cpp
+++ b/src/net/tmwa/generalhandler.cpp
@@ -54,6 +54,7 @@
 #include "net/tmwa/itemhandler.h"
 #include "net/tmwa/loginhandler.h"
 #include "net/tmwa/mailhandler.h"
+#include "net/tmwa/mercenaryhandler.h"
 #include "net/tmwa/network.h"
 #include "net/tmwa/npchandler.h"
 #include "net/tmwa/partyhandler.h"
@@ -104,7 +105,8 @@ GeneralHandler::GeneralHandler() :
     mAuctionHandler(new AuctionHandler),
     mCashShopHandler(new CashShopHandler),
     mFamilyHandler(new FamilyHandler),
-    mBankHandler(new BankHandler)
+    mBankHandler(new BankHandler),
+    mMercenaryHandler(new MercenaryHandler)
 {
     static const uint16_t _messages[] =
     {
@@ -223,6 +225,7 @@ void GeneralHandler::load()
     mNetwork->registerHandler(mCashShopHandler);
     mNetwork->registerHandler(mFamilyHandler);
     mNetwork->registerHandler(mBankHandler);
+    mNetwork->registerHandler(mMercenaryHandler);
 }
 
 void GeneralHandler::reload()
diff --git a/src/net/tmwa/generalhandler.h b/src/net/tmwa/generalhandler.h
index 877e70a41..ed8a2e12c 100644
--- a/src/net/tmwa/generalhandler.h
+++ b/src/net/tmwa/generalhandler.h
@@ -84,6 +84,7 @@ class GeneralHandler final : public MessageHandler,
         MessageHandlerPtr mCashShopHandler;
         MessageHandlerPtr mFamilyHandler;
         MessageHandlerPtr mBankHandler;
+        MessageHandlerPtr mMercenaryHandler;
 };
 
 }  // namespace TmwAthena
diff --git a/src/net/tmwa/mercenaryhandler.cpp b/src/net/tmwa/mercenaryhandler.cpp
new file mode 100644
index 000000000..f6b722326
--- /dev/null
+++ b/src/net/tmwa/mercenaryhandler.cpp
@@ -0,0 +1,45 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2011-2014  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "net/tmwa/mercenaryhandler.h"
+
+#include "debug.h"
+
+extern Net::MercenaryHandler *mercenaryHandler;
+
+namespace TmwAthena
+{
+
+MercenaryHandler::MercenaryHandler() :
+    MessageHandler()
+{
+    static const uint16_t _messages[] =
+    {
+        0
+    };
+    handledMessages = _messages;
+    mercenaryHandler = this;
+}
+
+void MercenaryHandler::handleMessage(Net::MessageIn &msg A_UNUSED)
+{
+}
+
+}  // namespace TmwAthena
diff --git a/src/net/tmwa/mercenaryhandler.h b/src/net/tmwa/mercenaryhandler.h
new file mode 100644
index 000000000..e44d98ad1
--- /dev/null
+++ b/src/net/tmwa/mercenaryhandler.h
@@ -0,0 +1,44 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2011-2014  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef NET_TMWA_MERCENARYHANDLER_H
+#define NET_TMWA_MERCENARYHANDLER_H
+
+#include "net/mercenaryhandler.h"
+
+#include "net/tmwa/messagehandler.h"
+
+namespace TmwAthena
+{
+
+class MercenaryHandler final : public MessageHandler,
+                               public Net::MercenaryHandler
+{
+    public:
+        MercenaryHandler();
+
+        A_DELETE_COPY(MercenaryHandler)
+
+        void handleMessage(Net::MessageIn &msg) override final;
+};
+
+}  // namespace TmwAthena
+
+#endif  // NET_TMWA_MERCENARYHANDLER_H