diff options
author | Andrei Karas <akaras@inbox.ru> | 2012-02-11 14:58:14 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2012-02-11 14:58:14 +0300 |
commit | c14086d6a08fb2ea644eec9fafa0374604c98991 (patch) | |
tree | 29a00277b215a32e019fd06cab4b9ac709ac775c /src/net/ea/itemhandler.cpp | |
parent | 7e19d626711ecf70035b32ee99098fc7fc3419fe (diff) | |
download | manaplus-c14086d6a08fb2ea644eec9fafa0374604c98991.tar.gz manaplus-c14086d6a08fb2ea644eec9fafa0374604c98991.tar.bz2 manaplus-c14086d6a08fb2ea644eec9fafa0374604c98991.tar.xz manaplus-c14086d6a08fb2ea644eec9fafa0374604c98991.zip |
Add relative pixel based position to item drops (floor items).
Diffstat (limited to 'src/net/ea/itemhandler.cpp')
-rw-r--r-- | src/net/ea/itemhandler.cpp | 37 |
1 files changed, 24 insertions, 13 deletions
diff --git a/src/net/ea/itemhandler.cpp b/src/net/ea/itemhandler.cpp index e08fe2cd1..7a6ee2743 100644 --- a/src/net/ea/itemhandler.cpp +++ b/src/net/ea/itemhandler.cpp @@ -35,28 +35,39 @@ ItemHandler::ItemHandler() { } -void ItemHandler::processItemVisible(Net::MessageIn &msg, bool isDrop) +void ItemHandler::processItemVisible(Net::MessageIn &msg) { int id = msg.readInt32(); int itemId = msg.readInt16(); unsigned char identify = msg.readInt8(); // identify flag int x = msg.readInt16(); int y = msg.readInt16(); - int amount1 = msg.readInt16(); - int amount2 = msg.readInt16(); + int amount = msg.readInt16(); + int subX = msg.readInt8() + 16 - 8; + int subY = msg.readInt8() + 32 - 8; if (actorSpriteManager) { - if (!isDrop) - { - actorSpriteManager->createItem(id, itemId, - x, y, amount1, identify); - } - else - { - actorSpriteManager->createItem(id, itemId, - x, y, amount2, identify); - } + actorSpriteManager->createItem(id, itemId, + x, y, amount, identify, subX, subY); + } +} + +void ItemHandler::processItemDropped(Net::MessageIn &msg) +{ + int id = msg.readInt32(); + int itemId = msg.readInt16(); + unsigned char identify = msg.readInt8(); // identify flag + int x = msg.readInt16(); + int y = msg.readInt16(); + int subX = msg.readInt8() + 16 - 8; + int subY = msg.readInt8() + 32 - 8; + int amount = msg.readInt16(); + + if (actorSpriteManager) + { + actorSpriteManager->createItem(id, itemId, + x, y, amount, identify, subX, subY); } } |