summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenpachi Developer <Kenpachi.Developer@gmx.de>2020-06-25 07:43:00 +0200
committerKenpachi Developer <Kenpachi.Developer@gmx.de>2020-06-25 07:43:00 +0200
commitc17eedc3e25b7fbd5beb051ae4b90bab65dd6eab (patch)
treee36f615dac179b1f46ffcc46adb7fde6b7afd337
parentb36f4acb4ff6d5f2f701cdec83c96420959b27a0 (diff)
downloadhercules-c17eedc3e25b7fbd5beb051ae4b90bab65dd6eab.tar.gz
hercules-c17eedc3e25b7fbd5beb051ae4b90bab65dd6eab.tar.bz2
hercules-c17eedc3e25b7fbd5beb051ae4b90bab65dd6eab.tar.xz
hercules-c17eedc3e25b7fbd5beb051ae4b90bab65dd6eab.zip
Enable item consumption while Megaphone input box is present
-rw-r--r--src/map/pc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/pc.c b/src/map/pc.c
index 4c3f56280..bb7ace84f 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -5163,7 +5163,7 @@ static int pc_useitem(struct map_session_data *sd, int n)
nullpo_ret(sd);
Assert_ret(n >= 0 && n < sd->status.inventorySize);
- if ((sd->npc_id != 0 && (sd->npc_item_flag & ITEMENABLEDNPC_CONSUME) == 0)
+ if ((sd->npc_id != 0 && sd->state.using_megaphone == 0 && (sd->npc_item_flag & ITEMENABLEDNPC_CONSUME) == 0)
|| (sd->state.workinprogress & 1) != 0) {
#if PACKETVER >= 20110308
clif->msgtable(sd, MSG_BUSY);