From e0bd37fd01e8c14bf6d044382ac12cc11f5eaa43 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 17 Oct 2014 13:25:09 +0300 Subject: Add static in buysellhandler. --- src/net/ea/buysellhandler.cpp | 13 ++++++++----- src/net/ea/buysellhandler.h | 10 +++++----- src/net/eathena/buysellhandler.h | 2 +- src/net/tmwa/buysellhandler.h | 2 +- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/src/net/ea/buysellhandler.cpp b/src/net/ea/buysellhandler.cpp index 14378de4a..d4b660786 100644 --- a/src/net/ea/buysellhandler.cpp +++ b/src/net/ea/buysellhandler.cpp @@ -49,10 +49,13 @@ namespace Ea { -BuySellHandler::BuySellHandler() : - mNpcId(0), - mBuyDialog(nullptr) +int BuySellHandler::mNpcId = 0; +BuyDialog *BuySellHandler::mBuyDialog = nullptr; + +BuySellHandler::BuySellHandler() { + mNpcId = 0; + mBuyDialog = nullptr; } void BuySellHandler::requestSellList(const std::string &nick) const @@ -139,7 +142,7 @@ void BuySellHandler::processNpcBuySellChoice(Net::MessageIn &msg) } } -void BuySellHandler::processNpcSell(Net::MessageIn &msg) const +void BuySellHandler::processNpcSell(Net::MessageIn &msg) { msg.readInt16("len"); const int n_items = (msg.getLength() - 4) / 10; @@ -168,7 +171,7 @@ void BuySellHandler::processNpcSell(Net::MessageIn &msg) const } } -void BuySellHandler::processNpcBuyResponse(Net::MessageIn &msg) const +void BuySellHandler::processNpcBuyResponse(Net::MessageIn &msg) { const uint8_t response = msg.readUInt8("response"); if (response == 0U) diff --git a/src/net/ea/buysellhandler.h b/src/net/ea/buysellhandler.h index 67400a1b3..5f941354b 100644 --- a/src/net/ea/buysellhandler.h +++ b/src/net/ea/buysellhandler.h @@ -51,15 +51,15 @@ class BuySellHandler notfinal : public Net::BuySellHandler const ShopItem *const item, const int amount) const override final; - virtual void processNpcBuySellChoice(Net::MessageIn &msg); + static void processNpcBuySellChoice(Net::MessageIn &msg); - virtual void processNpcSell(Net::MessageIn &msg) const; + static void processNpcSell(Net::MessageIn &msg); - virtual void processNpcBuyResponse(Net::MessageIn &msg) const; + static void processNpcBuyResponse(Net::MessageIn &msg); protected: - int mNpcId; - BuyDialog *mBuyDialog; + static int mNpcId; + static BuyDialog *mBuyDialog; }; } // namespace Ea diff --git a/src/net/eathena/buysellhandler.h b/src/net/eathena/buysellhandler.h index 38e9f5da1..4db51b751 100644 --- a/src/net/eathena/buysellhandler.h +++ b/src/net/eathena/buysellhandler.h @@ -39,7 +39,7 @@ class BuySellHandler final : public MessageHandler, public Ea::BuySellHandler void handleMessage(Net::MessageIn &msg); - void processNpcBuy(Net::MessageIn &msg); + static void processNpcBuy(Net::MessageIn &msg); static void processNpcSellResponse(Net::MessageIn &msg); }; diff --git a/src/net/tmwa/buysellhandler.h b/src/net/tmwa/buysellhandler.h index a0c99908f..f553541b8 100644 --- a/src/net/tmwa/buysellhandler.h +++ b/src/net/tmwa/buysellhandler.h @@ -39,7 +39,7 @@ class BuySellHandler final : public MessageHandler, public Ea::BuySellHandler void handleMessage(Net::MessageIn &msg); - void processNpcBuy(Net::MessageIn &msg); + static void processNpcBuy(Net::MessageIn &msg); static void processNpcSellResponse(Net::MessageIn &msg); }; -- cgit v1.2.3-60-g2f50