diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-07-11 22:34:47 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-07-11 22:34:47 +0000 |
| commit | f4a4fa0c1dce4a905b777f599297d97816e7fad5 (patch) | |
| tree | bcc560bbd6b7f0a69c6f23c8a1920c2dc6ff8eca | |
| parent | b307bb07a41dd6189bb4133e5095751b5547ad3c (diff) | |
| download | hercules-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
| -rw-r--r-- | Changelog-Trunk.txt | 1 | ||||
| -rw-r--r-- | src/map/pc.c | 2 |
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]) || |