From b558c22a6a21f943c3ee75243d84b00ecae6cbe7 Mon Sep 17 00:00:00 2001 From: epoque11 Date: Thu, 29 Mar 2012 18:43:58 +0000 Subject: - Merged main-chat message handling (as requested/enforced by trojal <3) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15816 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/atcommand.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'src/map/atcommand.c') diff --git a/src/map/atcommand.c b/src/map/atcommand.c index 74021b3db..978feb552 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -7790,14 +7790,9 @@ ACMD_FUNC(main) clif_displaymessage(fd, msg_txt(387)); return -1; } - sprintf(atcmd_output, msg_txt(386), sd->status.name, message); - // I use 0xFE000000 color for signalizing that this message is - // main chat message. 0xFE000000 is invalid color, same using - // 0xFF000000 for simple (not colored) GM messages. [LuzZza] - intif_broadcast2(atcmd_output, strlen(atcmd_output) + 1, 0xFE000000, 0, 0, 0, 0); - - // Chat logging type 'M' / Main Chat - log_chat(LOG_CHAT_MAINCHAT, 0, sd->status.char_id, sd->status.account_id, mapindex_id2name(sd->mapindex), sd->bl.x, sd->bl.y, NULL, message); + + // send the message using inter-server system + intif_main_message( sd, message ); } } else { -- cgit v1.2.3-70-g09d2