diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-03-18 22:13:37 +0200 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-03-18 22:13:37 +0200 |
| commit | f4792bc06f21335fc2d1171d937ea7645ca0c253 (patch) | |
| tree | c7b11cf81f254f5b9ed2f5dbfe127649abc7545a /src/net/tmwa/inventoryhandler.cpp | |
| parent | f98d003e354a1792117b7cbc771d1dd91475a156 (diff) | |
| download | plus-f4792bc06f21335fc2d1171d937ea7645ca0c253.tar.gz plus-f4792bc06f21335fc2d1171d937ea7645ca0c253.tar.bz2 plus-f4792bc06f21335fc2d1171d937ea7645ca0c253.tar.xz plus-f4792bc06f21335fc2d1171d937ea7645ca0c253.zip | |
Fix most conversions except manaserv net code and some other code.
Diffstat (limited to 'src/net/tmwa/inventoryhandler.cpp')
| -rw-r--r-- | src/net/tmwa/inventoryhandler.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/net/tmwa/inventoryhandler.cpp b/src/net/tmwa/inventoryhandler.cpp index 203edaa26..e5ccc9110 100644 --- a/src/net/tmwa/inventoryhandler.cpp +++ b/src/net/tmwa/inventoryhandler.cpp @@ -158,7 +158,8 @@ void InventoryHandler::handleMessage(Net::MessageIn &msg) { int number, flag; int index, amount, itemId, equipType, arrow, refine; - int identified, cards[4], itemType; + int cards[4], itemType; + unsigned char identified; Inventory *inventory = 0; if (player_node) inventory = PlayerInfo::getInventory(); @@ -632,14 +633,14 @@ void InventoryHandler::moveItem(int source, int slot, int amount, if (source == Inventory::INVENTORY && destination == Inventory::STORAGE) { MessageOut outMsg(CMSG_MOVE_TO_STORAGE); - outMsg.writeInt16(slot + INVENTORY_OFFSET); + outMsg.writeInt16(static_cast<Sint16>(slot + INVENTORY_OFFSET)); outMsg.writeInt32(amount); } else if (source == Inventory::STORAGE && destination == Inventory::INVENTORY) { MessageOut outMsg(CSMG_MOVE_FROM_STORAGE); - outMsg.writeInt16(slot + STORAGE_OFFSET); + outMsg.writeInt16(static_cast<Sint16>(slot + STORAGE_OFFSET)); outMsg.writeInt32(amount); } } |