From d6f695749fb3ef591a39f6f328d37a81b9a763d1 Mon Sep 17 00:00:00 2001 From: skotlex Date: Fri, 30 Jun 2006 22:56:05 +0000 Subject: - Added a check to prevent equipped items from being traded. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7433 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Trunk.txt | 1 + src/map/trade.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index cefb47895..d8776eca8 100644 --- a/Changelog-Trunk.txt +++ b/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] diff --git a/src/map/trade.c b/src/map/trade.c index b9c142332..1e0486356 100644 --- a/src/map/trade.c +++ b/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 -- cgit v1.2.3-60-g2f50