summaryrefslogtreecommitdiff
path: root/src/map/guild.c
diff options
context:
space:
mode:
authoreathenabot <eathenabot@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-12-19 21:47:34 +0000
committereathenabot <eathenabot@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-12-19 21:47:34 +0000
commit59c5b131644b8caedae22f6e716cddab90512dae (patch)
treeeebca77b3fcfa24fa36d8dedde1d2c131c2d91d0 /src/map/guild.c
parent5019704630e86a940669b44da6b1d824d8c1577f (diff)
downloadhercules-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/guild.c')
-rw-r--r--src/map/guild.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/map/guild.c b/src/map/guild.c
index 49d92914e..ec15d8cfb 100644
--- a/src/map/guild.c
+++ b/src/map/guild.c
@@ -953,8 +953,7 @@ int guild_send_message(struct map_session_data *sd,const char *mes,int len)
guild_recv_message(sd->status.guild_id,sd->status.account_id,mes,len);
// Chat logging type 'G' / Guild Chat
- if( log_config.chat&1 || (log_config.chat&16 && !((agit_flag || agit2_flag) && log_config.chat&64)) )
- log_chat("G", sd->status.guild_id, sd->status.char_id, sd->status.account_id, mapindex_id2name(sd->mapindex), sd->bl.x, sd->bl.y, NULL, mes);
+ log_chat(LOG_CHAT_GUILD, sd->status.guild_id, sd->status.char_id, sd->status.account_id, mapindex_id2name(sd->mapindex), sd->bl.x, sd->bl.y, NULL, mes);
return 0;
}