diff options
| author | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-01-30 00:25:44 +0000 |
|---|---|---|
| committer | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-01-30 00:25:44 +0000 |
| commit | 741230435bd23aa692f552649664b67a43a358c0 (patch) | |
| tree | 2f659f9ff3ed0c2b3df3119315047b6f756ef135 /src/map/trade.c | |
| parent | d21f2f8479c618c15958ae1f9ac5811b9b035921 (diff) | |
| download | hercules-741230435bd23aa692f552649664b67a43a358c0.tar.gz hercules-741230435bd23aa692f552649664b67a43a358c0.tar.bz2 hercules-741230435bd23aa692f552649664b67a43a358c0.tar.xz hercules-741230435bd23aa692f552649664b67a43a358c0.zip | |
* Merged changes from trunk [14636:14686/trunk].
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/renewal@14687 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/trade.c')
| -rw-r--r-- | src/map/trade.c | 3 |
1 files changed, 2 insertions, 1 deletions
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. } |