summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-04-11 04:35:16 +0000
committershennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-04-11 04:35:16 +0000
commita23bc93b64df690d1b8ccef524e300ec712948dd (patch)
treea4567bce0d9369953a2fdb517f1a0e8334e4df59
parentb2d3ef23ba6b4312a3dd8a31b275b8d579c3df65 (diff)
downloadhercules-a23bc93b64df690d1b8ccef524e300ec712948dd.tar.gz
hercules-a23bc93b64df690d1b8ccef524e300ec712948dd.tar.bz2
hercules-a23bc93b64df690d1b8ccef524e300ec712948dd.tar.xz
hercules-a23bc93b64df690d1b8ccef524e300ec712948dd.zip
Fixed bugreport:4292 item_noequip now scans armor enchant gems.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15844 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--src/map/pc.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/map/pc.c b/src/map/pc.c
index dd1c19c49..5f74574d6 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -700,9 +700,14 @@ static int pc_isAllowedCardOn(struct map_session_data *sd,int s,int eqindex,int
int i;
struct item *item = &sd->status.inventory[eqindex];
struct item_data *data;
+
//Crafted/made/hatched items.
if (itemdb_isspecial(item->card[0]))
return 1;
+
+ /* scan for enchant armor gems */
+ if( item->card[MAX_SLOTS - 1] && s < MAX_SLOTS - 1 )
+ s = MAX_SLOTS - 1;
ARR_FIND( 0, s, i, item->card[i] && (data = itemdb_exists(item->card[i])) != NULL && data->flag.no_equip&flag );
return( i < s ) ? 0 : 1;