summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNo Name <remoit(DOT)nane(AT)gmail(DOT)com>2010-02-21 22:06:57 -0800
committerJared Adams <jaxad0127@gmail.com>2010-02-21 23:31:01 -0700
commitf400febc100ea7128cf19c6416b7ea20ded83929 (patch)
tree06c25cf41ab37c03934512cc4485f9f4ac9829fe
parent331129f03caffa6fc7f7a4d730623e88b8d8fc4f (diff)
downloadtmwa-f400febc100ea7128cf19c6416b7ea20ded83929.tar.gz
tmwa-f400febc100ea7128cf19c6416b7ea20ded83929.tar.bz2
tmwa-f400febc100ea7128cf19c6416b7ea20ded83929.tar.xz
tmwa-f400febc100ea7128cf19c6416b7ea20ded83929.zip
Fix trades cancelling without proper reason.
Addresses issue introduced by d6c7054 (by me).
-rw-r--r--src/map/trade.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/trade.c b/src/map/trade.c
index 0f21648..40a762b 100644
--- a/src/map/trade.c
+++ b/src/map/trade.c
@@ -343,6 +343,8 @@ void trade_tradecommit (struct map_session_data *sd)
MAP_LOG_PC (sd, " TRADECANCEL");
return;
}
+ sd->trade_partner = 0;
+ target_sd->trade_partner = 0;
for (trade_i = 0; trade_i < 10; trade_i++)
{
if (sd->deal_item_amount[trade_i] != 0)
@@ -399,9 +401,7 @@ void trade_tradecommit (struct map_session_data *sd)
clif_updatestatus (sd, SP_ZENY);
}
sd->deal_locked = 0;
- sd->trade_partner = 0;
target_sd->deal_locked = 0;
- target_sd->trade_partner = 0;
clif_tradecompleted (sd, 0);
clif_tradecompleted (target_sd, 0);
MAP_LOG_PC (sd, " TRADEOK");