diff options
| author | epoque11 <epoque11@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-03-29 18:43:58 +0000 |
|---|---|---|
| committer | epoque11 <epoque11@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-03-29 18:43:58 +0000 |
| commit | b558c22a6a21f943c3ee75243d84b00ecae6cbe7 (patch) | |
| tree | 59bd6ff54f1efdce67a849698e8e504de23758d5 /src/map/clif.c | |
| parent | d5134f4a7a590e40a91610418c695c4ff7387bd0 (diff) | |
| download | hercules-b558c22a6a21f943c3ee75243d84b00ecae6cbe7.tar.gz hercules-b558c22a6a21f943c3ee75243d84b00ecae6cbe7.tar.bz2 hercules-b558c22a6a21f943c3ee75243d84b00ecae6cbe7.tar.xz hercules-b558c22a6a21f943c3ee75243d84b00ecae6cbe7.zip | |
- 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
Diffstat (limited to 'src/map/clif.c')
| -rw-r--r-- | src/map/clif.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index 9dece4e7c..bd5f4721d 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -9827,14 +9827,10 @@ void clif_parse_WisMessage(int fd, struct map_session_data* sd) if(!sd->state.mainchat) clif_displaymessage(fd, msg_txt(388)); // You should enable main chat with "@main on" command. else { - char output[256]; - snprintf(output, ARRAYLENGTH(output), msg_txt(386), sd->status.name, message); - intif_broadcast2(output, strlen(output) + 1, 0xFE000000, 0, 0, 0, 0); + // send the main message using inter-server system + intif_main_message( sd, message ); } - // 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); - return; } |