Просмотр исходного кода

- Fixed being unable to compound cards in armor.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@7622 54d463be-8e91-2dee-dedb-b68131a5f0ec
skotlex 19 лет назад
Родитель
Сommit
aced45da67
2 измененных файлов с 2 добавлено и 1 удалено
  1. 1 0
      Changelog-Trunk.txt
  2. 1 1
      src/map/pc.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/07/11
+	* Fixed being unable to compound cards in armor. [Skotlex]
 	* Made @monsterignore be an universal ignore. Means you cannot be targetted
 	  as an enemy by anything. Also added alias "@battleignore" which does the
 	  same as monsterignore. [Skotlex]

+ 1 - 1
src/map/pc.c

@@ -2383,7 +2383,7 @@ int pc_insert_card(struct map_session_data *sd,int idx_card,int idx_equip)
 
 	//Check validity
 	if( nameid <= 0 || cardid <= 0 ||
-		(sd->inventory_data[idx_equip]->type!=IT_WEAPON && sd->inventory_data[idx_equip]->type!=IT_WEAPON)||
+		(sd->inventory_data[idx_equip]->type!=IT_WEAPON && sd->inventory_data[idx_equip]->type!=IT_ARMOR)||
 		sd->inventory_data[idx_card]->type!=IT_CARD || // Prevent Hack [Ancyker]
 		sd->status.inventory[idx_equip].identify==0 ||
 		itemdb_isspecial(sd->status.inventory[idx_equip].card[0]) ||