diff options
Diffstat (limited to 'src/net')
-rw-r--r-- | src/net/ea/itemhandler.cpp | 25 | ||||
-rw-r--r-- | src/net/ea/itemhandler.h | 2 | ||||
-rw-r--r-- | src/net/eathena/itemhandler.cpp | 25 | ||||
-rw-r--r-- | src/net/eathena/itemhandler.h | 2 | ||||
-rw-r--r-- | src/net/tmwa/itemhandler.cpp | 25 | ||||
-rw-r--r-- | src/net/tmwa/itemhandler.h | 2 |
6 files changed, 54 insertions, 27 deletions
diff --git a/src/net/ea/itemhandler.cpp b/src/net/ea/itemhandler.cpp index 84998bb0c..b8973c039 100644 --- a/src/net/ea/itemhandler.cpp +++ b/src/net/ea/itemhandler.cpp @@ -39,31 +39,6 @@ ItemHandler::~ItemHandler() { } -void ItemHandler::processItemVisible(Net::MessageIn &msg) -{ - const BeingId id = msg.readBeingId("item object id"); - const int itemId = msg.readInt16("item id"); - const Identified identified = fromInt( - msg.readUInt8("identify"), Identified); - const int x = msg.readInt16("x"); - const int y = msg.readInt16("y"); - const int amount = msg.readInt16("amount"); - const int subX = static_cast<int>(msg.readInt8("sub x")); - const int subY = static_cast<int>(msg.readInt8("sub y")); - - if (actorManager) - { - actorManager->createItem(id, - itemId, - x, y, - 0, - amount, - ItemColor_one, - identified, - subX, subY); - } -} - void ItemHandler::processItemRemove(Net::MessageIn &msg) { if (actorManager) diff --git a/src/net/ea/itemhandler.h b/src/net/ea/itemhandler.h index a67f701a4..f499a5f7b 100644 --- a/src/net/ea/itemhandler.h +++ b/src/net/ea/itemhandler.h @@ -42,8 +42,6 @@ class ItemHandler notfinal virtual ~ItemHandler(); - static void processItemVisible(Net::MessageIn &msg); - static void processItemRemove(Net::MessageIn &msg); }; diff --git a/src/net/eathena/itemhandler.cpp b/src/net/eathena/itemhandler.cpp index f906ae9e9..98ab79f78 100644 --- a/src/net/eathena/itemhandler.cpp +++ b/src/net/eathena/itemhandler.cpp @@ -128,4 +128,29 @@ void ItemHandler::processItemMvpDropped(Net::MessageIn &msg) msg.readString(24, "monster name"); } +void ItemHandler::processItemVisible(Net::MessageIn &msg) +{ + const BeingId id = msg.readBeingId("item object id"); + const int itemId = msg.readInt16("item id"); + const Identified identified = fromInt( + msg.readUInt8("identify"), Identified); + const int x = msg.readInt16("x"); + const int y = msg.readInt16("y"); + const int amount = msg.readInt16("amount"); + const int subX = static_cast<int>(msg.readInt8("sub x")); + const int subY = static_cast<int>(msg.readInt8("sub y")); + + if (actorManager) + { + actorManager->createItem(id, + itemId, + x, y, + 0, + amount, + ItemColor_one, + identified, + subX, subY); + } +} + } // namespace EAthena diff --git a/src/net/eathena/itemhandler.h b/src/net/eathena/itemhandler.h index dd357b50a..5e8753126 100644 --- a/src/net/eathena/itemhandler.h +++ b/src/net/eathena/itemhandler.h @@ -45,6 +45,8 @@ class ItemHandler final : public MessageHandler, public Ea::ItemHandler static void processGraffiti(Net::MessageIn &msg); static void processItemMvpDropped(Net::MessageIn &msg); + + static void processItemVisible(Net::MessageIn &msg); }; } // namespace EAthena diff --git a/src/net/tmwa/itemhandler.cpp b/src/net/tmwa/itemhandler.cpp index dfe2023f4..336fb619c 100644 --- a/src/net/tmwa/itemhandler.cpp +++ b/src/net/tmwa/itemhandler.cpp @@ -92,4 +92,29 @@ void ItemHandler::processItemDropped(Net::MessageIn &msg) } } +void ItemHandler::processItemVisible(Net::MessageIn &msg) +{ + const BeingId id = msg.readBeingId("item object id"); + const int itemId = msg.readInt16("item id"); + const Identified identified = fromInt( + msg.readUInt8("identify"), Identified); + const int x = msg.readInt16("x"); + const int y = msg.readInt16("y"); + const int amount = msg.readInt16("amount"); + const int subX = static_cast<int>(msg.readInt8("sub x")); + const int subY = static_cast<int>(msg.readInt8("sub y")); + + if (actorManager) + { + actorManager->createItem(id, + itemId, + x, y, + 0, + amount, + ItemColor_one, + identified, + subX, subY); + } +} + } // namespace TmwAthena diff --git a/src/net/tmwa/itemhandler.h b/src/net/tmwa/itemhandler.h index 99de07414..d8debe7e4 100644 --- a/src/net/tmwa/itemhandler.h +++ b/src/net/tmwa/itemhandler.h @@ -41,6 +41,8 @@ class ItemHandler final : public MessageHandler, public Ea::ItemHandler protected: static void processItemDropped(Net::MessageIn &msg); + + static void processItemVisible(Net::MessageIn &msg); }; } // namespace TmwAthena |