summaryrefslogtreecommitdiff
path: root/src/map/rodex.c
diff options
context:
space:
mode:
authorKenpachi Developer <Kenpachi.Developer@gmx.de>2020-06-25 08:14:57 +0200
committerKenpachi Developer <Kenpachi.Developer@gmx.de>2020-06-25 08:14:57 +0200
commit90a72bc5eaae71d2ccdd4c1b6f859afb4c336fc6 (patch)
tree431d41816d7029bb8fbc92a1be9414e138abaa7e /src/map/rodex.c
parent1ae87bdd29223dd5983b92bbac54496e7277d98d (diff)
downloadhercules-90a72bc5eaae71d2ccdd4c1b6f859afb4c336fc6.tar.gz
hercules-90a72bc5eaae71d2ccdd4c1b6f859afb4c336fc6.tar.bz2
hercules-90a72bc5eaae71d2ccdd4c1b6f859afb4c336fc6.tar.xz
hercules-90a72bc5eaae71d2ccdd4c1b6f859afb4c336fc6.zip
Enable sending mails while Megaphone input box is present
Diffstat (limited to 'src/map/rodex.c')
-rw-r--r--src/map/rodex.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/rodex.c b/src/map/rodex.c
index 1ebed0623..998066eca 100644
--- a/src/map/rodex.c
+++ b/src/map/rodex.c
@@ -231,7 +231,7 @@ static int rodex_send_mail(struct map_session_data *sd, const char *receiver_nam
nullpo_retr(RODEX_SEND_MAIL_FATAL_ERROR, body);
nullpo_retr(RODEX_SEND_MAIL_FATAL_ERROR, title);
- if (!rodex->isenabled() || sd->npc_id > 0) {
+ if (!rodex->isenabled() || (sd->npc_id != 0 && sd->state.using_megaphone == 0)) {
rodex->clean(sd, 1);
return RODEX_SEND_MAIL_FATAL_ERROR;
}