summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKenpachi Developer <Kenpachi.Developer@gmx.de>2020-06-25 08:21:57 +0200
committerKenpachi Developer <Kenpachi.Developer@gmx.de>2020-06-25 08:21:57 +0200
commite7f6a8ad0baefe9827b42a01d99ce2e507bf9284 (patch)
treecd3adca0b91c23358ace4b10bd89bd4cb22851c8 /src
parent1ee5255bc81b5057dae57f4f1d91b7c70efeb143 (diff)
downloadhercules-e7f6a8ad0baefe9827b42a01d99ce2e507bf9284.tar.gz
hercules-e7f6a8ad0baefe9827b42a01d99ce2e507bf9284.tar.bz2
hercules-e7f6a8ad0baefe9827b42a01d99ce2e507bf9284.tar.xz
hercules-e7f6a8ad0baefe9827b42a01d99ce2e507bf9284.zip
Disable using Megaphone while Megaphone input box is present
Diffstat (limited to 'src')
-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 63d62467c..ae746dab4 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -5190,7 +5190,7 @@ static int pc_useitem(struct map_session_data *sd, int n)
// Store information for later use before it is lost (via pc->delitem) [Paradox924X]
nameid = sd->inventory_data[n]->nameid;
- if (nameid == ITEMID_MEGAPHONE && (sd->state.workinprogress & 2) != 0) {
+ if (nameid == ITEMID_MEGAPHONE && ((sd->state.workinprogress & 2) != 0 || sd->state.using_megaphone != 0)) {
#if PACKETVER >= 20110308
clif->msgtable(sd, MSG_BUSY);
#else