summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDennis Friis <peavey@placid.dk>2008-10-23 14:20:07 +0000
committerDennis Friis <peavey@placid.dk>2008-10-23 14:20:07 +0000
commitc650e2b6338cf4b18b0968623d12ef95a7b820fc (patch)
tree5a4a51c640e2bbb3d5fe2c4c5fb5b8b7ecd64c3a
parenta18daa91c8aa12307c5d73fdb2a83a3cce92d20f (diff)
downloadmana-c650e2b6338cf4b18b0968623d12ef95a7b820fc.tar.gz
mana-c650e2b6338cf4b18b0968623d12ef95a7b820fc.tar.bz2
mana-c650e2b6338cf4b18b0968623d12ef95a7b820fc.tar.xz
mana-c650e2b6338cf4b18b0968623d12ef95a7b820fc.zip
Add support for new athena trade-add failure condition; no free slot.
-rw-r--r--ChangeLog5
-rw-r--r--src/net/tradehandler.cpp8
2 files changed, 12 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a48ca311..cad907ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-23 Dennis Friis <peavey@placid.dk>
+
+ * src/net/tradehandler.cpp: Add support for new athena trade-add
+ failure condition; no free slot.
+
2008-10-22 David Athay <ko2fan@gmail.com>
* src/gui/ok_dialog.cpp, src/net/loginhandler.cpp: Now shows ban time.
diff --git a/src/net/tradehandler.cpp b/src/net/tradehandler.cpp
index 9599fa9d..e2f7b998 100644
--- a/src/net/tradehandler.cpp
+++ b/src/net/tradehandler.cpp
@@ -130,7 +130,7 @@ void TradeHandler::handleMessage(MessageIn *msg)
chatWindow->chatLog("Trade with " + tradePartnerName +
" cancelled", BY_SERVER);
// otherwise ignore silently
-
+
tradeWindow->setVisible(false);
player_node->setTrading(false);
break;
@@ -189,6 +189,12 @@ void TradeHandler::handleMessage(MessageIn *msg)
"partner is over weighted.",
BY_SERVER);
break;
+ case 2:
+ // Add item failed - player has no free slot
+ chatWindow->chatLog("Failed adding item. Trade "
+ "partner has no free slot.",
+ BY_SERVER);
+ break;
default:
chatWindow->chatLog("Failed adding item for "
"unknown reason.", BY_SERVER);