From cb547b67772615063c3d5dd16df645b6cd872a0e Mon Sep 17 00:00:00 2001 From: skotlex Date: Thu, 6 Apr 2006 23:02:31 +0000 Subject: - Hopefully fixed the wedding item-trade restriction. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5939 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Trunk.txt | 1 + src/map/itemdb.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index fa2905f6b..0f0d61d00 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/04/06 + * Hopefully fixed the wedding item-trade restriction. [Skotlex] * Fixed status_clear_buffs making SC_BERSERK's end send you to 100hp. [Skotlex] * Rewrote the guild exp cache code to prevent overflows and to use the diff --git a/src/map/itemdb.c b/src/map/itemdb.c index cac0ae986..d9f75a6e7 100644 --- a/src/map/itemdb.c +++ b/src/map/itemdb.c @@ -339,7 +339,7 @@ int itemdb_cantrade(int nameid, int gmlv, int gmlv2) int itemdb_canpartnertrade(int nameid, int gmlv, int gmlv2) { struct item_data* item = itemdb_exists(nameid); - return (item && (!(item->flag.trade_restriction&(2|4)) || gmlv >= item->gm_lv_trade_override || gmlv2 >= item->gm_lv_trade_override)); + return (item && (item->flag.trade_restriction&4 || gmlv >= item->gm_lv_trade_override || gmlv2 >= item->gm_lv_trade_override)); } int itemdb_cansell(int nameid, int gmlv) -- cgit v1.2.3-70-g09d2