summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-07-11 22:34:47 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-07-11 22:34:47 +0000
commitf4a4fa0c1dce4a905b777f599297d97816e7fad5 (patch)
treebcc560bbd6b7f0a69c6f23c8a1920c2dc6ff8eca /src/map
parentb307bb07a41dd6189bb4133e5095751b5547ad3c (diff)
downloadhercules-f4a4fa0c1dce4a905b777f599297d97816e7fad5.tar.gz
hercules-f4a4fa0c1dce4a905b777f599297d97816e7fad5.tar.bz2
hercules-f4a4fa0c1dce4a905b777f599297d97816e7fad5.tar.xz
hercules-f4a4fa0c1dce4a905b777f599297d97816e7fad5.zip
- Fixed being unable to compound cards in armor.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7622 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r--src/map/pc.c2
1 files changed, 1 insertions, 1 deletions
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]) ||