- Added a check to prevent equipped items from being traded.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@7433 54d463be-8e91-2dee-dedb-b68131a5f0ec

Changelog-Trunk.txt

@@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
 2006/05/30
+	* Added a check to prevent equipped items from being traded. [Skotlex]
 	* Added UF_SONG (0x400) to differentiate songs from dances. [Skotlex]
 	* Added preliminar support for making a Song+Dance turn into BA_DISSONANCE
 	  cells. Beware of potential bugs as it's untested. [Skotlex]

src/map/trade.c

@@ -324,6 +324,9 @@ void trade_tradeadditem(struct map_session_data *sd, int index, int amount) {
 	if (amount < 0 || amount > sd->status.inventory[index].amount)
 		return;
 
+	if (sd->status.inventory[index].equip)
+		return; //must not be able to trade equipped items.
+
 	nameid = sd->inventory_data[index]->nameid;
 
 	if (!itemdb_cantrade(nameid, pc_isGM(sd), pc_isGM(target_sd)) &&	//Can't trade