diff options
| author | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-01-01 01:05:32 +0000 |
|---|---|---|
| committer | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-01-01 01:05:32 +0000 |
| commit | 231c0084678af14b7443cbd47da99ebe380fe85c (patch) | |
| tree | 3e652bccf0092e56c38f8eee3870f29db996c341 | |
| parent | ee42d435d483d82a7b5ab753204030c363080a69 (diff) | |
| download | hercules-231c0084678af14b7443cbd47da99ebe380fe85c.tar.gz hercules-231c0084678af14b7443cbd47da99ebe380fe85c.tar.bz2 hercules-231c0084678af14b7443cbd47da99ebe380fe85c.tar.xz hercules-231c0084678af14b7443cbd47da99ebe380fe85c.zip | |
* Pending trade requests no longer prevent a character from trading someone else instead (official).
- This fixes trade window displaying wrong name when attempting to deal multiple characters (bugreport:344).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14645 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 3 | ||||
| -rw-r--r-- | src/map/trade.c | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 2b5592929..12cbc86dc 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -1,5 +1,8 @@ Date Added +2010/12/31 + * Pending trade requests no longer prevent a character from trading someone else instead (official). [Ai4rei] + - This fixes trade window displaying wrong name when attempting to deal multiple characters (bugreport:344). 2010/12/30 * Fixed improper use of itemdb_search. It does not return NULL but a dummy item, if the item id is invalid. [Ai4rei] 2010/12/29 diff --git a/src/map/trade.c b/src/map/trade.c index 32c84b508..ba01826f2 100644 --- a/src/map/trade.c +++ b/src/map/trade.c @@ -56,7 +56,7 @@ void trade_traderequest(struct map_session_data *sd, struct map_session_data *ta } } - if ((target_sd->trade_partner != 0) || (sd->trade_partner != 0)) { + if (target_sd->trade_partner != 0) { clif_tradestart(sd, 2); // person is in another trade return; } @@ -110,6 +110,7 @@ void trade_tradeack(struct map_session_data *sd, int type) if (tsd->state.trading || tsd->trade_partner != sd->bl.id) { clif_tradestart(sd, 2); + sd->trade_partner=0; return; //Already trading or wrong partner. } |