summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--src/map/pc.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 1d07a6394..5f355a99b 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/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]
diff --git a/src/map/pc.c b/src/map/pc.c
index a36c38e13..d8b8f9bfa 100644
--- a/src/map/pc.c
+++ b/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]) ||