diff options
author | Kenpachi Developer <Kenpachi.Developer@gmx.de> | 2020-06-25 08:20:50 +0200 |
---|---|---|
committer | Kenpachi Developer <Kenpachi.Developer@gmx.de> | 2020-06-25 08:20:50 +0200 |
commit | 1ee5255bc81b5057dae57f4f1d91b7c70efeb143 (patch) | |
tree | b50ce313490ffdf805f0b332fdb87a6d0ea9bbe9 /src/map/pc.c | |
parent | 87994df22212939fb9151160015953daccc289b6 (diff) | |
download | hercules-1ee5255bc81b5057dae57f4f1d91b7c70efeb143.tar.gz hercules-1ee5255bc81b5057dae57f4f1d91b7c70efeb143.tar.bz2 hercules-1ee5255bc81b5057dae57f4f1d91b7c70efeb143.tar.xz hercules-1ee5255bc81b5057dae57f4f1d91b7c70efeb143.zip |
Disable using Megaphone while Rodex send mail window is present
This also fixes the issue where the client freezes when talking to a NPC while Rodex send mail window is present.
Diffstat (limited to 'src/map/pc.c')
-rw-r--r-- | src/map/pc.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/map/pc.c b/src/map/pc.c index 085b7c6bb..63d62467c 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -5190,6 +5190,15 @@ 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 PACKETVER >= 20110308 + clif->msgtable(sd, MSG_BUSY); +#else + clif->messagecolor_self(sd->fd, COLOR_WHITE, msg_sd(sd, 48)); +#endif + return 0; + } + if (nameid != ITEMID_NAUTHIZ && sd->sc.opt1 > 0 && sd->sc.opt1 != OPT1_STONEWAIT && sd->sc.opt1 != OPT1_BURNING) return 0; |