summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorIra Rice <irarice@gmail.com>2008-10-23 16:22:25 +0000
committerIra Rice <irarice@gmail.com>2008-10-23 16:22:25 +0000
commitaae1df481432c4ea162641e5ff5fdc5c385afd62 (patch)
tree9c0c7bef25e7e4ad8afabc42ab8f0feb2f890158 /src
parentba4a95460650b93deca7b7dcff6775f013b73119 (diff)
downloadmana-aae1df481432c4ea162641e5ff5fdc5c385afd62.tar.gz
mana-aae1df481432c4ea162641e5ff5fdc5c385afd62.tar.bz2
mana-aae1df481432c4ea162641e5ff5fdc5c385afd62.tar.xz
mana-aae1df481432c4ea162641e5ff5fdc5c385afd62.zip
Added a patch by peavey over on TMW to disallow adding items to trade if
the trade partner doesn't have room for them.
Diffstat (limited to 'src')
-rw-r--r--src/net/playerhandler.cpp8
-rw-r--r--src/net/tradehandler.cpp6
2 files changed, 10 insertions, 4 deletions
diff --git a/src/net/playerhandler.cpp b/src/net/playerhandler.cpp
index 61e68295..ea561a81 100644
--- a/src/net/playerhandler.cpp
+++ b/src/net/playerhandler.cpp
@@ -177,6 +177,9 @@ void PlayerHandler::handleMessage(MessageIn *msg)
case 0x0006: player_node->mMaxHp = value; break;
case 0x0007: player_node->mMp = value; break;
case 0x0008: player_node->mMaxMp = value; break;
+ case 0x0009:
+ player_node->mStatsPointsToAttribute = value;
+ break;
case 0x000b: player_node->mLevel = value; break;
case 0x000c:
player_node->mSkillPoint = value;
@@ -197,10 +200,6 @@ void PlayerHandler::handleMessage(MessageIn *msg)
player_node->mTotalWeight = value;
break;
case 0x0019: player_node->mMaxWeight = value; break;
- case 0x0037: player_node->mJobLevel = value; break;
- case 0x0009:
- player_node->mStatsPointsToAttribute = value;
- break;
case 0x0029: player_node->ATK = value; break;
case 0x002b: player_node->MATK = value; break;
case 0x002d: player_node->DEF = value; break;
@@ -209,6 +208,7 @@ void PlayerHandler::handleMessage(MessageIn *msg)
case 0x0031: player_node->HIT = value; break;
case 0x0032: player_node->FLEE = value; break;
case 0x0035: player_node->mAttackSpeed = value; break;
+ case 0x0037: player_node->mJobLevel = value; break;
}
if (player_node->mHp == 0 && deathNotice == NULL)
diff --git a/src/net/tradehandler.cpp b/src/net/tradehandler.cpp
index cfd24977..9174d846 100644
--- a/src/net/tradehandler.cpp
+++ b/src/net/tradehandler.cpp
@@ -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);