summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-SVN.txt1
-rw-r--r--src/map/trade.c4
2 files changed, 3 insertions, 2 deletions
diff --git a/Changelog-SVN.txt b/Changelog-SVN.txt
index 10ab1f650..dcb72a6cf 100644
--- a/Changelog-SVN.txt
+++ b/Changelog-SVN.txt
@@ -1,6 +1,7 @@
Date Added
03/23
+ * Adjusted my trade fix [1280: MouseJstr]
* Fixed possible memory corruption in storage if number of guilds
in database exceeds the max server can support [1278 : MouseJstr]
* Fixed @mapexit to properly flush the fifo's before shutting
diff --git a/src/map/trade.c b/src/map/trade.c
index 5219c27fa..d98eed2a0 100644
--- a/src/map/trade.c
+++ b/src/map/trade.c
@@ -220,8 +220,8 @@ void trade_tradeok(struct map_session_data *sd) {
// check items
for(trade_i = 0; trade_i < 10; trade_i++) {
- if (((sd->deal_item_index[trade_i]-2) < 0) ||
- (sd->deal_item_amount[trade_i] > sd->status.inventory[sd->deal_item_index[trade_i]-2].amount) ||
+ if ((((sd->deal_item_index[trade_i]-2) >= 0) &&
+ (sd->deal_item_amount[trade_i] > sd->status.inventory[sd->deal_item_index[trade_i]-2].amount)) ||
(sd->deal_item_amount[trade_i] < 0)) {
trade_tradecancel(sd);
return;