diff options
Diffstat (limited to 'src/net')
-rw-r--r-- | src/net/cashshophandler.h | 1 | ||||
-rw-r--r-- | src/net/eathena/cashshophandler.cpp | 4 | ||||
-rw-r--r-- | src/net/eathena/markethandler.h | 4 | ||||
-rw-r--r-- | src/net/markethandler.h | 2 | ||||
-rw-r--r-- | src/net/tmwa/markethandler.h | 1 |
5 files changed, 5 insertions, 7 deletions
diff --git a/src/net/cashshophandler.h b/src/net/cashshophandler.h index 78ae668eb..5e6421a0f 100644 --- a/src/net/cashshophandler.h +++ b/src/net/cashshophandler.h @@ -38,7 +38,6 @@ class CashShopHandler notfinal const int itemId, const unsigned char color, const int amount) const = 0; - }; } // namespace Net diff --git a/src/net/eathena/cashshophandler.cpp b/src/net/eathena/cashshophandler.cpp index ba6a5455f..c6191c512 100644 --- a/src/net/eathena/cashshophandler.cpp +++ b/src/net/eathena/cashshophandler.cpp @@ -105,8 +105,8 @@ void CashShopHandler::buyItem(const int points, outMsg.writeInt16(10 + 4, "len"); outMsg.writeInt32(points, "points"); outMsg.writeInt16(1, "count"); - outMsg.writeInt16(amount, "amount"); - outMsg.writeInt16(itemId, "item id"); + outMsg.writeInt16(static_cast<int16_t>(amount), "amount"); + outMsg.writeInt16(static_cast<int16_t>(itemId), "item id"); } } // namespace EAthena diff --git a/src/net/eathena/markethandler.h b/src/net/eathena/markethandler.h index c910d6fdc..42a4bcac0 100644 --- a/src/net/eathena/markethandler.h +++ b/src/net/eathena/markethandler.h @@ -47,9 +47,9 @@ class MarketHandler final : public MessageHandler, const int amount) const override final; protected: - void processMarketOpen(Net::MessageIn &msg); + static void processMarketOpen(Net::MessageIn &msg); - void processMarketBuyAck(Net::MessageIn &msg); + static void processMarketBuyAck(Net::MessageIn &msg); static BuyDialog *mBuyDialog; }; diff --git a/src/net/markethandler.h b/src/net/markethandler.h index aecdce151..a80cfcea0 100644 --- a/src/net/markethandler.h +++ b/src/net/markethandler.h @@ -46,4 +46,4 @@ class MarketHandler notfinal extern Net::MarketHandler *marketHandler; -#endif // NET_MARKETNDLER_H +#endif // NET_MARKETHANDLER_H diff --git a/src/net/tmwa/markethandler.h b/src/net/tmwa/markethandler.h index ab527ca87..5ac55d993 100644 --- a/src/net/tmwa/markethandler.h +++ b/src/net/tmwa/markethandler.h @@ -43,7 +43,6 @@ class MarketHandler final : public MessageHandler, const int type, const unsigned char color, const int amount) const override final; - }; } // namespace TmwAthena |