summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorParadox924X <Paradox924X@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-11-08 23:28:11 +0000
committerParadox924X <Paradox924X@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-11-08 23:28:11 +0000
commitd7f4a7a1b43ec0fc20c05936d08a91962b9b774d (patch)
treea8af0558acc1455361fedbea9429de31380dd264
parentb63046dd0986a0a84a1e4e5993a2bc5bcdbe8e5c (diff)
downloadhercules-d7f4a7a1b43ec0fc20c05936d08a91962b9b774d.tar.gz
hercules-d7f4a7a1b43ec0fc20c05936d08a91962b9b774d.tar.bz2
hercules-d7f4a7a1b43ec0fc20c05936d08a91962b9b774d.tar.xz
hercules-d7f4a7a1b43ec0fc20c05936d08a91962b9b774d.zip
Notify players involved in a trade that it has been canceled when one player changes maps/logs out or otherwise becomes unable to participate in the trade.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14452 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--src/map/trade.c6
2 files changed, 6 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 089a0af91..37467bd7a 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -1,6 +1,7 @@
Date Added
2010/11/08
+ * Notify players involved in a trade that it has been canceled when one player changes maps/logs out or otherwise becomes unable to participate in the trade. [Paradox924X]
* Send the actual level of the person you're trading with rather than limiting it by the max_lv/aura_lv settings. [Paradox924X]
2010/11/07
* 'Exp gained' packets are now sent regardless of @showexp. @showexp can be enabled regardless of PACKETVER. [Gepard]
diff --git a/src/map/trade.c b/src/map/trade.c
index 392acb33f..32c84b508 100644
--- a/src/map/trade.c
+++ b/src/map/trade.c
@@ -455,8 +455,12 @@ void trade_tradecancel(struct map_session_data *sd)
if(!sd->state.trading)
{ // Not trade acepted
- if( target_sd ) target_sd->trade_partner = 0;
+ if( target_sd ) {
+ target_sd->trade_partner = 0;
+ clif_tradecancelled(target_sd);
+ }
sd->trade_partner = 0;
+ clif_tradecancelled(sd);
return;
}