Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Pending trade requests no longer prevent a character from trading someone else instead (official).

Browse Source 
- This fixes trade window displaying wrong name when attempting to deal multiple characters (bugreport:344).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14645 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
ai4rei
2011-01-01 01:05:32 +00:00
parent 55a4f8411e
commit bf53c4e2a8
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Changelog-Trunk.txt
View File

@@ -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

3
src/map/trade.c
View File

@@ -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.
}