summaryrefslogtreecommitdiff
path: root/src/net/eathena/generalhandler.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-09-02 20:58:41 +0300
committerAndrei Karas <akaras@inbox.ru>2015-09-02 20:58:41 +0300
commit84d2bab38202cd52b5eb0a37c12204ab6f607915 (patch)
tree2f3951b2f4f3b75f190eb2539979cc4afbace27c /src/net/eathena/generalhandler.cpp
parent40730c4fa73d403cf7284a76d9b26f7ec662afa4 (diff)
downloadmv-84d2bab38202cd52b5eb0a37c12204ab6f607915.tar.gz
mv-84d2bab38202cd52b5eb0a37c12204ab6f607915.tar.bz2
mv-84d2bab38202cd52b5eb0a37c12204ab6f607915.tar.xz
mv-84d2bab38202cd52b5eb0a37c12204ab6f607915.zip
Remove MessageHandler class
Diffstat (limited to 'src/net/eathena/generalhandler.cpp')
-rw-r--r--src/net/eathena/generalhandler.cpp31
1 files changed, 4 insertions, 27 deletions
diff --git a/src/net/eathena/generalhandler.cpp b/src/net/eathena/generalhandler.cpp
index f57bcef35..ba3c0aadb 100644
--- a/src/net/eathena/generalhandler.cpp
+++ b/src/net/eathena/generalhandler.cpp
@@ -37,6 +37,7 @@
#include "net/eathena/adminhandler.h"
#include "net/eathena/auctionhandler.h"
#include "net/eathena/bankhandler.h"
+#include "net/eathena/battlegroundhandler.h"
#include "net/eathena/beinghandler.h"
#include "net/eathena/buyingstorehandler.h"
#include "net/eathena/buysellhandler.h"
@@ -52,6 +53,7 @@
#include "net/eathena/inventoryhandler.h"
#include "net/eathena/itemhandler.h"
#include "net/eathena/loginhandler.h"
+#include "net/eathena/maphandler.h"
#include "net/eathena/mailhandler.h"
#include "net/eathena/markethandler.h"
#include "net/eathena/mercenaryhandler.h"
@@ -82,7 +84,6 @@ namespace EAthena
{
GeneralHandler::GeneralHandler() :
- MessageHandler(),
mAdminHandler(new AdminHandler),
mBeingHandler(new BeingHandler(config.getBoolValue("EnableSync"))),
mBuySellHandler(new BuySellHandler),
@@ -106,25 +107,18 @@ GeneralHandler::GeneralHandler() :
mCashShopHandler(new CashShopHandler),
mFamilyHandler(new FamilyHandler),
mBankHandler(new BankHandler),
- mBattleGroundHandler(new BankHandler),
+ mBattleGroundHandler(new BattleGroundHandler),
mMercenaryHandler(new MercenaryHandler),
mBuyingStoreHandler(new BuyingStoreHandler),
mHomunculusHandler(new HomunculusHandler),
mFriendsHandler(new FriendsHandler),
mElementalHandler(new ElementalHandler),
- mMapHandler(new MarketHandler),
+ mMapHandler(new MapHandler),
mMarketHandler(new MarketHandler),
mVendingHandler(new VendingHandler),
mRouletteHandler(new RouletteHandler),
mSearchStoreHandler(new SearchStoreHandler)
{
- static const uint16_t _messages[] =
- {
- SMSG_CONNECTION_PROBLEM,
- SMSG_MAP_NOT_FOUND,
- 0
- };
- handledMessages = _messages;
generalHandler = this;
std::vector<ItemDB::Stat> stats;
@@ -143,23 +137,6 @@ GeneralHandler::~GeneralHandler()
delete2(Network::mInstance);
}
-void GeneralHandler::handleMessage(Net::MessageIn &msg)
-{
- switch (msg.getId())
- {
- case SMSG_CONNECTION_PROBLEM:
- GeneralRecv::processConnectionProblem(msg);
- break;
-
- case SMSG_MAP_NOT_FOUND:
- GeneralRecv::processMapNotFound(msg);
- break;
-
- default:
- break;
- }
-}
-
void GeneralHandler::load()
{
new Network;