Sfoglia il codice sorgente

- Hopefully fixed the wedding item-trade restriction.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@5939 54d463be-8e91-2dee-dedb-b68131a5f0ec
skotlex 19 anni fa
parent
commit
1d5b54e996
2 ha cambiato i file con 2 aggiunte e 1 eliminazioni
  1. 1 0
      Changelog-Trunk.txt
  2. 1 1
      src/map/itemdb.c

+ 1 - 0
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

+ 1 - 1
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)