summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2019-07-28 19:38:05 +0200
committerGitHub <noreply@github.com>2019-07-28 19:38:05 +0200
commit5a453c9764dca103c8823a28bb59b62198967ae0 (patch)
treeaa7ee6c496d7dee14f25ff871b75b48f86e387a3
parent9034007595aa0ef58d28f09253ba15f405a011ab (diff)
parentb927d6d8b634c505e942cd97a4622b31a21bf9b3 (diff)
downloadhercules-5a453c9764dca103c8823a28bb59b62198967ae0.tar.gz
hercules-5a453c9764dca103c8823a28bb59b62198967ae0.tar.bz2
hercules-5a453c9764dca103c8823a28bb59b62198967ae0.tar.xz
hercules-5a453c9764dca103c8823a28bb59b62198967ae0.zip
Merge pull request #2508 from Emistry/scriptcommand_isequipped
Update script command isequipped count
-rw-r--r--src/map/script.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/map/script.c b/src/map/script.c
index c1e210d27..20b4c238a 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -16589,6 +16589,8 @@ static BUILDIN(isequippedcnt)
if(j == EQI_HAND_R && sd->equip_index[EQI_HAND_L] == index) continue;
if(j == EQI_HEAD_MID && sd->equip_index[EQI_HEAD_LOW] == index) continue;
if(j == EQI_HEAD_TOP && (sd->equip_index[EQI_HEAD_MID] == index || sd->equip_index[EQI_HEAD_LOW] == index)) continue;
+ if(j == EQI_COSTUME_MID && sd->equip_index[EQI_COSTUME_LOW] == index) continue;
+ if(j == EQI_COSTUME_TOP && (sd->equip_index[EQI_COSTUME_MID] == index || sd->equip_index[EQI_COSTUME_LOW] == index)) continue;
if(!sd->inventory_data[index])
continue;
@@ -16642,6 +16644,8 @@ static BUILDIN(isequipped)
if(j == EQI_HAND_R && sd->equip_index[EQI_HAND_L] == index) continue;
if(j == EQI_HEAD_MID && sd->equip_index[EQI_HEAD_LOW] == index) continue;
if(j == EQI_HEAD_TOP && (sd->equip_index[EQI_HEAD_MID] == index || sd->equip_index[EQI_HEAD_LOW] == index)) continue;
+ if(j == EQI_COSTUME_MID && sd->equip_index[EQI_COSTUME_LOW] == index) continue;
+ if(j == EQI_COSTUME_TOP && (sd->equip_index[EQI_COSTUME_MID] == index || sd->equip_index[EQI_COSTUME_LOW] == index)) continue;
if(!sd->inventory_data[index])
continue;