summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorKenpachi Developer <Kenpachi.Developer@gmx.de>2020-06-25 07:47:31 +0200
committerKenpachi Developer <Kenpachi.Developer@gmx.de>2020-06-25 07:47:31 +0200
commit57731298a77bfcbce5f2839ed71bd50c0996af95 (patch)
tree27578895fe0e0b7dfa335b05d758e316188b8d92 /src/map
parentf60881dad234b44bbf6b6e49519b8acc05234e03 (diff)
downloadhercules-57731298a77bfcbce5f2839ed71bd50c0996af95.tar.gz
hercules-57731298a77bfcbce5f2839ed71bd50c0996af95.tar.bz2
hercules-57731298a77bfcbce5f2839ed71bd50c0996af95.tar.xz
hercules-57731298a77bfcbce5f2839ed71bd50c0996af95.zip
Enable attacking while Megaphone input box is present
Diffstat (limited to 'src/map')
-rw-r--r--src/map/clif.c4
1 files changed, 3 insertions, 1 deletions
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;