diff options
| author | David Athay <ko2fan@gmail.com> | 2008-06-14 16:59:25 +0000 |
|---|---|---|
| committer | David Athay <ko2fan@gmail.com> | 2008-06-14 16:59:25 +0000 |
| commit | 3fcb588f254ccf5869842dfd1965decaf2008817 (patch) | |
| tree | af1432da97e170506e8fd0a29d4559a38c4d8dae | |
| parent | 5fbb6c822dcf01297a29078eb6abc552dcb8b80d (diff) | |
| download | mana-3fcb588f254ccf5869842dfd1965decaf2008817.tar.gz mana-3fcb588f254ccf5869842dfd1965decaf2008817.tar.bz2 mana-3fcb588f254ccf5869842dfd1965decaf2008817.tar.xz mana-3fcb588f254ccf5869842dfd1965decaf2008817.zip | |
Fixed trade bug again.
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | src/net/tradehandler.cpp | 4 |
2 files changed, 3 insertions, 2 deletions
@@ -2,6 +2,7 @@ * src/gui/shop.cpp, src/gui/browserbox.cpp, src/net/tradehandler.cpp: Fixed compilation errors. Fixed trade bug (although a little hacky right now). + * src/net/tradehandler.cpp: Changed bug fix as requested by Bjørn. 2008-06-08 Fate <fate.tmw@googlemail.com> diff --git a/src/net/tradehandler.cpp b/src/net/tradehandler.cpp index ed1536eb..af000b3b 100644 --- a/src/net/tradehandler.cpp +++ b/src/net/tradehandler.cpp @@ -159,12 +159,12 @@ void TradeHandler::handleMessage(MessageIn *msg) // Trade: New Item add response (was 0x00ea, now 01b1) { const int index = msg->readInt16(); - if (index == 0) + Item *item = player_node->getInventory()->getItem(index); + if (!item) { tradeWindow->receivedOk(true); return; } - Item *item = player_node->getInventory()->getItem(index); Sint16 quantity = msg->readInt16(); switch (msg->readInt8()) |