diff options
| author | eathenabot <eathenabot@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-12-19 21:47:34 +0000 |
|---|---|---|
| committer | eathenabot <eathenabot@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-12-19 21:47:34 +0000 |
| commit | 59c5b131644b8caedae22f6e716cddab90512dae (patch) | |
| tree | eebca77b3fcfa24fa36d8dedde1d2c131c2d91d0 /src/map/atcommand.c | |
| parent | 5019704630e86a940669b44da6b1d824d8c1577f (diff) | |
| download | hercules-59c5b131644b8caedae22f6e716cddab90512dae.tar.gz hercules-59c5b131644b8caedae22f6e716cddab90512dae.tar.bz2 hercules-59c5b131644b8caedae22f6e716cddab90512dae.tar.xz hercules-59c5b131644b8caedae22f6e716cddab90512dae.zip | |
* Merged changes up to eAthena 15036.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15167 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/atcommand.c')
| -rw-r--r-- | src/map/atcommand.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/map/atcommand.c b/src/map/atcommand.c index 2b2f44278..00d7deb5f 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -8309,8 +8309,7 @@ ACMD_FUNC(main) intif_broadcast2(atcmd_output, strlen(atcmd_output) + 1, 0xFE000000, 0, 0, 0, 0); // Chat logging type 'M' / Main Chat - if( log_config.chat&1 || (log_config.chat&32 && !((agit_flag || agit2_flag) && log_config.chat&64)) ) - log_chat("M", 0, sd->status.char_id, sd->status.account_id, mapindex_id2name(sd->mapindex), sd->bl.x, sd->bl.y, NULL, message); + 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); } } else { |