summaryrefslogtreecommitdiff
path: root/src/map/clif.c
diff options
context:
space:
mode:
authormalufett <malufett.eat.my.binaries@gmail.com>2013-02-27 02:23:06 +0800
committermalufett <malufett.eat.my.binaries@gmail.com>2013-02-27 02:23:06 +0800
commitad792f41994ce54dc9e45fbdaaf591f38fccecee (patch)
tree2f9042554878cd443db1b422358ace08c92a6dc1 /src/map/clif.c
parent06526e32ea7608dfc62ad5aeca91cf78ff3a446f (diff)
downloadhercules-ad792f41994ce54dc9e45fbdaaf591f38fccecee.tar.gz
hercules-ad792f41994ce54dc9e45fbdaaf591f38fccecee.tar.bz2
hercules-ad792f41994ce54dc9e45fbdaaf591f38fccecee.tar.xz
hercules-ad792f41994ce54dc9e45fbdaaf591f38fccecee.zip
Fixed Bug #6527
-Where all NPC don't allow changing of equipments by default and now can be set in 'items.conf'.
Diffstat (limited to 'src/map/clif.c')
-rw-r--r--src/map/clif.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/map/clif.c b/src/map/clif.c
index 82ff333a1..ea05baa3c 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -10207,10 +10207,10 @@ void clif_parse_EquipItem(int fd,struct map_session_data *sd)
if (index < 0 || index >= MAX_INVENTORY)
return; //Out of bounds check.
- if(sd->npc_id) {
- if (sd->npc_id != sd->npc_item_flag)
+ if( sd->npc_id )
+ if ( !sd->npc_item_flag )
return;
- } else if (sd->state.storage_flag || sd->sc.opt1)
+ else if ( sd->state.storage_flag || sd->sc.opt1 )
; //You can equip/unequip stuff while storage is open/under status changes
else if ( pc_cant_act2(sd) )
return;
@@ -10247,7 +10247,10 @@ void clif_parse_UnequipItem(int fd,struct map_session_data *sd)
return;
}
- if (sd->state.storage_flag || sd->sc.opt1)
+ if( sd->npc_id )
+ if ( !sd->npc_item_flag )
+ return;
+ else if ( sd->state.storage_flag || sd->sc.opt1 )
; //You can equip/unequip stuff while storage is open/under status changes
else if ( pc_cant_act2(sd) )
return;