diff options
Diffstat (limited to 'src/net/tradehandler.cpp')
| -rw-r--r-- | src/net/tradehandler.cpp | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/src/net/tradehandler.cpp b/src/net/tradehandler.cpp index 5bce0574..0f5bdcdc 100644 --- a/src/net/tradehandler.cpp +++ b/src/net/tradehandler.cpp @@ -90,7 +90,7 @@ void TradeHandler::handleMessage(MessageIn *msg) break; case SMSG_TRADE_RESPONSE: - switch (msg->readInt8()) + switch (msg->readByte()) { case 0: // Too far away chatWindow->chatLog("Trading isn't possible. " @@ -126,12 +126,11 @@ void TradeHandler::handleMessage(MessageIn *msg) case SMSG_TRADE_ITEM_ADD: { - Sint32 amount = msg->readInt32(); - Sint16 type = msg->readInt16(); - msg->readInt8(); // identified flag - msg->readInt8(); // attribute - msg->readInt8(); // refine - msg->skip(8); // card (4 shorts) + Sint32 amount = msg->readLong(); + Sint16 type = msg->readShort(); + msg->readByte(); // identified flag + msg->readByte(); // attribute + msg->readByte(); // refine // TODO: handle also identified, etc if (type == 0) { @@ -145,10 +144,10 @@ void TradeHandler::handleMessage(MessageIn *msg) case SMSG_TRADE_ITEM_ADD_RESPONSE: // Trade: New Item add response (was 0x00ea, now 01b1) { - Item *item = player_node->getInvItem(msg->readInt16()); - Sint16 quantity = msg->readInt16(); + Item *item = player_node->getInvItem(msg->readShort()); + Sint16 quantity = msg->readShort(); - switch (msg->readInt8()) + switch (msg->readByte()) { case 0: // Successfully added item @@ -176,7 +175,7 @@ void TradeHandler::handleMessage(MessageIn *msg) case SMSG_TRADE_OK: // 0 means ok from myself, 1 means ok from other; - tradeWindow->receivedOk(msg->readInt8() == 0); + tradeWindow->receivedOk(msg->readByte() == 0); break; case SMSG_TRADE_CANCEL: |