From 29a39909e3f53305c4e29fdcba863f94603b8763 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 16 Aug 2015 13:57:49 +0300 Subject: Add missing fields into flooritem. --- src/net/ea/itemhandler.cpp | 7 +++++-- src/net/eathena/itemhandler.cpp | 7 +++++-- src/net/tmwa/itemhandler.cpp | 10 ++++++++-- 3 files changed, 18 insertions(+), 6 deletions(-) (limited to 'src/net') diff --git a/src/net/ea/itemhandler.cpp b/src/net/ea/itemhandler.cpp index 478c17990..84998bb0c 100644 --- a/src/net/ea/itemhandler.cpp +++ b/src/net/ea/itemhandler.cpp @@ -43,7 +43,8 @@ void ItemHandler::processItemVisible(Net::MessageIn &msg) { const BeingId id = msg.readBeingId("item object id"); const int itemId = msg.readInt16("item id"); - const ItemColor identify = fromInt(msg.readUInt8("identify"), ItemColor); + 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"); @@ -55,8 +56,10 @@ void ItemHandler::processItemVisible(Net::MessageIn &msg) actorManager->createItem(id, itemId, x, y, + 0, amount, - identify, + ItemColor_one, + identified, subX, subY); } } diff --git a/src/net/eathena/itemhandler.cpp b/src/net/eathena/itemhandler.cpp index 4fa4a7e3e..f906ae9e9 100644 --- a/src/net/eathena/itemhandler.cpp +++ b/src/net/eathena/itemhandler.cpp @@ -81,8 +81,9 @@ void ItemHandler::processItemDropped(Net::MessageIn &msg) { const BeingId id = msg.readBeingId("id"); const int itemId = msg.readInt16("item id"); - msg.readInt16("type"); - msg.readUInt8("identify"); + const int itemType = msg.readInt16("type"); + const Identified identified = fromInt( + msg.readUInt8("identify"), Identified); const int x = msg.readInt16("x"); const int y = msg.readInt16("y"); const int subX = static_cast(msg.readInt8("subx")); @@ -94,8 +95,10 @@ void ItemHandler::processItemDropped(Net::MessageIn &msg) actorManager->createItem(id, itemId, x, y, + itemType, amount, ItemColor_one, + identified, subX, subY); } } diff --git a/src/net/tmwa/itemhandler.cpp b/src/net/tmwa/itemhandler.cpp index 745c79865..dfe2023f4 100644 --- a/src/net/tmwa/itemhandler.cpp +++ b/src/net/tmwa/itemhandler.cpp @@ -81,8 +81,14 @@ void ItemHandler::processItemDropped(Net::MessageIn &msg) if (actorManager) { - actorManager->createItem(id, itemId, - x, y, amount, identify, subX, subY); + actorManager->createItem(id, + itemId, + x, y, + 0, + amount, + identify, + Identified_false, + subX, subY); } } -- cgit v1.2.3-60-g2f50