diff options
| author | Kenpachi Developer <Kenpachi.Developer@gmx.de> | 2020-06-25 08:05:10 +0200 |
|---|---|---|
| committer | Kenpachi Developer <Kenpachi.Developer@gmx.de> | 2020-06-25 08:05:10 +0200 |
| commit | d6622f54398a780d9c007c75855971ebb2a19ea1 (patch) | |
| tree | 2d848946ec7483e23018dd4d69ad927880db6deb /src/map/clif.c | |
| parent | 7aacf9eed8162c18733364cc9b52f1b9358bc9db (diff) | |
| download | hercules-d6622f54398a780d9c007c75855971ebb2a19ea1.tar.gz hercules-d6622f54398a780d9c007c75855971ebb2a19ea1.tar.bz2 hercules-d6622f54398a780d9c007c75855971ebb2a19ea1.tar.xz hercules-d6622f54398a780d9c007c75855971ebb2a19ea1.zip | |
Enable trading while Megaphone input box is present
Diffstat (limited to 'src/map/clif.c')
| -rw-r--r-- | src/map/clif.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index 491e4f805..deb53bccb 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -12454,7 +12454,7 @@ static void clif_parse_TradeRequest(int fd, struct map_session_data *sd) struct map_session_data *t_sd = map->id2sd(RFIFOL(fd, 2)); - if (sd->chat_id == 0 && pc_cant_act(sd)) + if (pc_cant_act_except_npc_chat(sd) || (sd->npc_id != 0 && sd->state.using_megaphone == 0)) return; //You can trade while in a chatroom. // @noask [LuzZza] @@ -13330,7 +13330,7 @@ static void clif_parse_NpcStringInput(int fd, struct map_session_data *sd) __att /// 01d5 <packet len>.W <npc id>.L <string>.?B static void clif_parse_NpcStringInput(int fd, struct map_session_data *sd) { - if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd)) + if ((sd->state.trading != 0 && sd->state.using_megaphone == 0) || pc_isdead(sd) || pc_isvending(sd)) return; int len = RFIFOW(fd, 2); |