summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/CMakeLists.txt5
-rw-r--r--src/Makefile.am5
-rw-r--r--src/net/eathena/generalhandler.cpp5
-rw-r--r--src/net/eathena/generalhandler.h1
-rw-r--r--src/net/eathena/markethandler.cpp50
-rw-r--r--src/net/eathena/markethandler.h43
-rw-r--r--src/net/markethandler.h42
-rw-r--r--src/net/net.cpp2
-rw-r--r--src/net/tmwa/generalhandler.cpp5
-rw-r--r--src/net/tmwa/generalhandler.h1
-rw-r--r--src/net/tmwa/markethandler.cpp50
-rw-r--r--src/net/tmwa/markethandler.h43
12 files changed, 250 insertions, 2 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 062a2a5e7..d9e314785 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -550,6 +550,7 @@ SET(SRCS
net/logindata.h
net/loginhandler.h
net/mailhandler.h
+ net/markethandler.h
net/mercenaryhandler.h
net/messagehandler.h
net/messagein.cpp
@@ -1349,6 +1350,8 @@ SET(SRCS_TMWA
net/tmwa/loginhandler.h
net/tmwa/mailhandler.cpp
net/tmwa/mailhandler.h
+ net/tmwa/markethandler.cpp
+ net/tmwa/markethandler.h
net/tmwa/mercenaryhandler.cpp
net/tmwa/mercenaryhandler.h
net/tmwa/messagehandler.cpp
@@ -1426,6 +1429,8 @@ SET(SRCS_EATHENA
net/eathena/menu.cpp
net/eathena/menu.h
net/eathena/menutype.h
+ net/eathena/markethandler.cpp
+ net/eathena/markethandler.h
net/eathena/mercenaryhandler.cpp
net/eathena/mercenaryhandler.h
net/eathena/messagehandler.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index c39c7938a..6ae632933 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -680,6 +680,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
net/loginhandler.h \
net/mailhandler.h \
net/mercenaryhandler.h \
+ net/markethandler.h \
net/messagehandler.h \
net/messagein.cpp \
net/messagein.h \
@@ -1283,6 +1284,8 @@ manaplus_SOURCES += \
net/tmwa/loginhandler.h \
net/tmwa/mailhandler.cpp \
net/tmwa/mailhandler.h \
+ net/tmwa/markethandler.cpp \
+ net/tmwa/markethandler.h \
net/tmwa/mercenaryhandler.cpp \
net/tmwa/mercenaryhandler.h \
net/tmwa/messagehandler.cpp \
@@ -1361,6 +1364,8 @@ manaplus_SOURCES += net/eathena/adminhandler.cpp \
net/eathena/menu.cpp \
net/eathena/menu.h \
net/eathena/menutype.h \
+ net/eathena/markethandler.cpp \
+ net/eathena/markethandler.h \
net/eathena/mercenaryhandler.cpp \
net/eathena/mercenaryhandler.h \
net/eathena/messagehandler.cpp \
diff --git a/src/net/eathena/generalhandler.cpp b/src/net/eathena/generalhandler.cpp
index 7be63489e..f8d15ac16 100644
--- a/src/net/eathena/generalhandler.cpp
+++ b/src/net/eathena/generalhandler.cpp
@@ -57,6 +57,7 @@
#include "net/eathena/itemhandler.h"
#include "net/eathena/loginhandler.h"
#include "net/eathena/mailhandler.h"
+#include "net/eathena/markethandler.h"
#include "net/eathena/mercenaryhandler.h"
#include "net/eathena/network.h"
#include "net/eathena/npchandler.h"
@@ -113,7 +114,8 @@ GeneralHandler::GeneralHandler() :
mBuyingStoreHandler(new BuyingStoreHandler),
mHomunculusHandler(new HomunculusHandler),
mFriendsHandler(new FriendsHandler),
- mElementalHandler(new ElementalHandler)
+ mElementalHandler(new ElementalHandler),
+ mMarketHandler(new MarketHandler)
{
static const uint16_t _messages[] =
{
@@ -301,6 +303,7 @@ void GeneralHandler::load()
mNetwork->registerHandler(mHomunculusHandler);
mNetwork->registerHandler(mFriendsHandler);
mNetwork->registerHandler(mElementalHandler);
+ mNetwork->registerHandler(mMarketHandler);
}
void GeneralHandler::reload()
diff --git a/src/net/eathena/generalhandler.h b/src/net/eathena/generalhandler.h
index cf6c33f4d..d11e33be6 100644
--- a/src/net/eathena/generalhandler.h
+++ b/src/net/eathena/generalhandler.h
@@ -93,6 +93,7 @@ class GeneralHandler final : public MessageHandler,
MessageHandlerPtr mHomunculusHandler;
MessageHandlerPtr mFriendsHandler;
MessageHandlerPtr mElementalHandler;
+ MessageHandlerPtr mMarketHandler;
};
} // namespace EAthena
diff --git a/src/net/eathena/markethandler.cpp b/src/net/eathena/markethandler.cpp
new file mode 100644
index 000000000..2643dd24b
--- /dev/null
+++ b/src/net/eathena/markethandler.cpp
@@ -0,0 +1,50 @@
+/*
+ * 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/markethandler.h"
+
+#include "debug.h"
+
+extern Net::MarketHandler *marketHandler;
+
+namespace EAthena
+{
+
+MarketHandler::MarketHandler() :
+ MessageHandler()
+{
+ static const uint16_t _messages[] =
+ {
+ 0
+ };
+ handledMessages = _messages;
+ marketHandler = this;
+}
+
+void MarketHandler::handleMessage(Net::MessageIn &msg)
+{
+ switch (msg.getId())
+ {
+ default:
+ break;
+ }
+}
+
+} // namespace EAthena
diff --git a/src/net/eathena/markethandler.h b/src/net/eathena/markethandler.h
new file mode 100644
index 000000000..c10d347eb
--- /dev/null
+++ b/src/net/eathena/markethandler.h
@@ -0,0 +1,43 @@
+/*
+ * 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_MARKETHANDLER_H
+#define NET_EATHENA_MARKETHANDLER_H
+
+#include "net/markethandler.h"
+
+#include "net/eathena/messagehandler.h"
+
+namespace EAthena
+{
+class MarketHandler final : public MessageHandler,
+ public Net::MarketHandler
+{
+ public:
+ MarketHandler();
+
+ A_DELETE_COPY(MarketHandler)
+
+ void handleMessage(Net::MessageIn &msg) override final;
+};
+
+} // namespace EAthena
+
+#endif // NET_EATHENA_MARKETHANDLER_H
diff --git a/src/net/markethandler.h b/src/net/markethandler.h
new file mode 100644
index 000000000..2ff4d5d4d
--- /dev/null
+++ b/src/net/markethandler.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_MARKETHANDLER_H
+#define NET_MARKETHANDLER_H
+
+#include <string>
+
+#include "localconsts.h"
+
+namespace Net
+{
+
+class MarketHandler notfinal
+{
+ public:
+ virtual ~MarketHandler()
+ { }
+};
+
+} // namespace Net
+
+extern Net::MarketHandler *marketHandler;
+
+#endif // NET_MARKETNDLER_H
diff --git a/src/net/net.cpp b/src/net/net.cpp
index 9ae41a72b..39caea9fa 100644
--- a/src/net/net.cpp
+++ b/src/net/net.cpp
@@ -58,6 +58,7 @@ namespace Net
class HomunculusHandler;
class InventoryHandler;
class MailHandler;
+ class MarketHandler;
class MercenaryHandler;
class NpcHandler;
class PartyHandler;
@@ -97,6 +98,7 @@ Net::BuyingStoreHandler *buyingStoreHandler = nullptr;
Net::HomunculusHandler *homunculusHandler = nullptr;
Net::FriendsHandler *friendsHandler = nullptr;
Net::ElementalHandler *elementalHandler = nullptr;
+Net::MarketHandler *marketHandler = nullptr;
namespace Net
{
diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp
index 0a81b764c..54eb1eecb 100644
--- a/src/net/tmwa/generalhandler.cpp
+++ b/src/net/tmwa/generalhandler.cpp
@@ -55,6 +55,7 @@
#include "net/tmwa/itemhandler.h"
#include "net/tmwa/loginhandler.h"
#include "net/tmwa/mailhandler.h"
+#include "net/tmwa/markethandler.h"
#include "net/tmwa/mercenaryhandler.h"
#include "net/tmwa/network.h"
#include "net/tmwa/npchandler.h"
@@ -111,7 +112,8 @@ GeneralHandler::GeneralHandler() :
mBuyingStoreHandler(new BuyingStoreHandler),
mHomunculusHandler(new HomunculusHandler),
mFriendsHandler(new FriendsHandler),
- mElementalHandler(new ElementalHandler)
+ mElementalHandler(new ElementalHandler),
+ mMarketHandler(new MarketHandler)
{
static const uint16_t _messages[] =
{
@@ -237,6 +239,7 @@ void GeneralHandler::load()
mNetwork->registerHandler(mHomunculusHandler);
mNetwork->registerHandler(mFriendsHandler);
mNetwork->registerHandler(mElementalHandler);
+ mNetwork->registerHandler(mMarketHandler);
}
void GeneralHandler::reload()
diff --git a/src/net/tmwa/generalhandler.h b/src/net/tmwa/generalhandler.h
index fb2f54d6e..21345bd42 100644
--- a/src/net/tmwa/generalhandler.h
+++ b/src/net/tmwa/generalhandler.h
@@ -91,6 +91,7 @@ class GeneralHandler final : public MessageHandler,
MessageHandlerPtr mHomunculusHandler;
MessageHandlerPtr mFriendsHandler;
MessageHandlerPtr mElementalHandler;
+ MessageHandlerPtr mMarketHandler;
};
} // namespace TmwAthena
diff --git a/src/net/tmwa/markethandler.cpp b/src/net/tmwa/markethandler.cpp
new file mode 100644
index 000000000..6fe4a22cd
--- /dev/null
+++ b/src/net/tmwa/markethandler.cpp
@@ -0,0 +1,50 @@
+/*
+ * 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/markethandler.h"
+
+#include "debug.h"
+
+extern Net::MarketHandler *marketHandler;
+
+namespace TmwAthena
+{
+
+MarketHandler::MarketHandler() :
+ MessageHandler()
+{
+ static const uint16_t _messages[] =
+ {
+ 0
+ };
+ handledMessages = _messages;
+ marketHandler = this;
+}
+
+void MarketHandler::handleMessage(Net::MessageIn &msg)
+{
+ switch (msg.getId())
+ {
+ default:
+ break;
+ }
+}
+
+} // namespace TmwAthena
diff --git a/src/net/tmwa/markethandler.h b/src/net/tmwa/markethandler.h
new file mode 100644
index 000000000..366191277
--- /dev/null
+++ b/src/net/tmwa/markethandler.h
@@ -0,0 +1,43 @@
+/*
+ * 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_MARKETHANDLER_H
+#define NET_TMWA_MARKETHANDLER_H
+
+#include "net/markethandler.h"
+
+#include "net/tmwa/messagehandler.h"
+
+namespace TmwAthena
+{
+class MarketHandler final : public MessageHandler,
+ public Net::MarketHandler
+{
+ public:
+ MarketHandler();
+
+ A_DELETE_COPY(MarketHandler)
+
+ void handleMessage(Net::MessageIn &msg) override final;
+};
+
+} // namespace TmwAthena
+
+#endif // NET_TMWA_MARKETHANDLER_H