From 57731298a77bfcbce5f2839ed71bd50c0996af95 Mon Sep 17 00:00:00 2001
From: Kenpachi Developer <Kenpachi.Developer@gmx.de>
Date: Thu, 25 Jun 2020 07:47:31 +0200
Subject: Enable attacking while Megaphone input box is present
---
src/map/clif.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/map/clif.c b/src/map/clif.c
index f4b6e7505..b025249e7 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -11653,8 +11653,10 @@ static void clif_parse_ActionRequest_sub(struct map_session_data *sd, int action
return;
}
- if (pc_cant_act(sd) || pc_issit(sd) || sd->sc.option&OPTION_HIDE || pc_isvending(sd))
+ if (pc_cant_act_except_npc(sd) || (sd->npc_id != 0 && sd->state.using_megaphone == 0)
+ || pc_issit(sd) || (sd->sc.option & OPTION_HIDE) != 0 || pc_isvending(sd)) {
return;
+ }
if (sd->sc.option & OPTION_COSTUME)
return;
--
cgit v1.2.3-70-g09d2