diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/map/clif.c | 6 | ||||
| -rw-r--r-- | src/map/pc.c | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index 1c5f7e003..cf6257628 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -9927,13 +9927,13 @@ void clif_parse_GlobalMessage(int fd, struct map_session_data* sd) } WFIFOSET(fd, WFIFOW(fd,2)); + // Chat logging type 'O' / Global Chat + logs->chat(LOG_CHAT_GLOBAL, 0, sd->status.char_id, sd->status.account_id, mapindex_id2name(sd->mapindex), sd->bl.x, sd->bl.y, NULL, message); + #ifdef PCRE_SUPPORT // trigger listening npcs map->foreachinrange(npc_chat->sub, &sd->bl, AREA_SIZE, BL_NPC, text, textlen, &sd->bl); #endif - - // Chat logging type 'O' / Global Chat - logs->chat(LOG_CHAT_GLOBAL, 0, sd->status.char_id, sd->status.account_id, mapindex_id2name(sd->mapindex), sd->bl.x, sd->bl.y, NULL, message); } diff --git a/src/map/pc.c b/src/map/pc.c index 87f14bcd9..5eb682415 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -10477,6 +10477,12 @@ void pc_autotrade_prepare(struct map_session_data *sd) { sex = sd->status.sex; safestrncpy(title, sd->message, sizeof(title)); + sd->npc_id = 0; + sd->npc_shopid = 0; + if (sd->st) { + sd->st->state = END; + sd->st = NULL; + } map->quit(sd); chrif->auth_delete(account_id, char_id, ST_LOGOUT); |