summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorEmistry Haoyan <equinox1991@gmail.com>2019-07-21 05:37:05 +0800
committerEmistry Haoyan <equinox1991@gmail.com>2019-07-21 05:37:05 +0800
commitb927d6d8b634c505e942cd97a4622b31a21bf9b3 (patch)
treecf6447dbf96502fd827ab761c97e287d1851eadc /src
parenta5eb6ec995612c878a3b6cb522520ffae8b13a3b (diff)
downloadhercules-b927d6d8b634c505e942cd97a4622b31a21bf9b3.tar.gz
hercules-b927d6d8b634c505e942cd97a4622b31a21bf9b3.tar.bz2
hercules-b927d6d8b634c505e942cd97a4622b31a21bf9b3.tar.xz
hercules-b927d6d8b634c505e942cd97a4622b31a21bf9b3.zip
Update script command isequipped
- added missing costume equipment validation
Diffstat (limited to 'src')
-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;