summaryrefslogtreecommitdiff
path: root/src/map/clif.c
diff options
context:
space:
mode:
authorKenpachi Developer <Kenpachi.Developer@gmx.de>2020-06-25 07:45:13 +0200
committerKenpachi Developer <Kenpachi.Developer@gmx.de>2020-06-25 07:45:13 +0200
commit4562766f5fd87d9024b29098b8a1a47d8766ee8f (patch)
tree6e6c8f0e1f65df2dda1576b3febd4e0af254a42c /src/map/clif.c
parentc17eedc3e25b7fbd5beb051ae4b90bab65dd6eab (diff)
downloadhercules-4562766f5fd87d9024b29098b8a1a47d8766ee8f.tar.gz
hercules-4562766f5fd87d9024b29098b8a1a47d8766ee8f.tar.bz2
hercules-4562766f5fd87d9024b29098b8a1a47d8766ee8f.tar.xz
hercules-4562766f5fd87d9024b29098b8a1a47d8766ee8f.zip
Enable changing equipment while Megaphone input box is present
Diffstat (limited to 'src/map/clif.c')
-rw-r--r--src/map/clif.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/clif.c b/src/map/clif.c
index 351637967..ae03e6f4f 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -12053,7 +12053,7 @@ static void clif_parse_EquipItem(int fd, struct map_session_data *sd)
return; //Out of bounds check.
if( sd->npc_id ) {
- if ((sd->npc_item_flag & ITEMENABLEDNPC_EQUIP) == 0)
+ if ((sd->npc_item_flag & ITEMENABLEDNPC_EQUIP) == 0 && sd->state.using_megaphone == 0)
return;
} else if (sd->state.storage_flag != STORAGE_FLAG_CLOSED || sd->sc.opt1)
; //You can equip/unequip stuff while storage is open/under status changes
@@ -12098,7 +12098,7 @@ static void clif_parse_UnequipItem(int fd, struct map_session_data *sd)
}
if( sd->npc_id ) {
- if ((sd->npc_item_flag & ITEMENABLEDNPC_EQUIP) == 0)
+ if ((sd->npc_item_flag & ITEMENABLEDNPC_EQUIP) == 0 && sd->state.using_megaphone == 0)
return;
} else if (sd->state.storage_flag != STORAGE_FLAG_CLOSED || sd->sc.opt1)
; //You can equip/unequip stuff while storage is open/under status changes