summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-09-24 22:33:50 +0000
committerultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-09-24 22:33:50 +0000
commit02ff54ba1d0b87b29f19c29524ba77a2f30a6d85 (patch)
treed2814fe7fef01907672f0b54543fc4494259c954 /src/map
parent40fc1ff930002e0ca7301e0f2d575a40f784fb10 (diff)
downloadhercules-02ff54ba1d0b87b29f19c29524ba77a2f30a6d85.tar.gz
hercules-02ff54ba1d0b87b29f19c29524ba77a2f30a6d85.tar.bz2
hercules-02ff54ba1d0b87b29f19c29524ba77a2f30a6d85.tar.xz
hercules-02ff54ba1d0b87b29f19c29524ba77a2f30a6d85.zip
Added back log_chat's '1 - log everything' setting (revert from r10850).
Don't forget to adjust your config file ... again. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11289 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r--src/map/atcommand.c2
-rw-r--r--src/map/clif.c4
-rw-r--r--src/map/guild.c2
-rw-r--r--src/map/log.c21
-rw-r--r--src/map/party.c2
5 files changed, 15 insertions, 16 deletions
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index 44d3bdc58..2124a9181 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -9220,7 +9220,7 @@ int atcommand_main(const int fd, struct map_session_data* sd, const char* comman
intif_announce(atcmd_output, strlen(atcmd_output) + 1, 0xFE000000, 0);
// Chat logging type 'M' / Main Chat
- if( log_config.chat&16 && !(agit_flag && log_config.chat&32) )
+ if( log_config.chat&1 || (log_config.chat&32 && !(agit_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);
}
diff --git a/src/map/clif.c b/src/map/clif.c
index 5c3b62f23..e10a95d99 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -8517,7 +8517,7 @@ void clif_parse_GlobalMessage(int fd, struct map_session_data* sd)
}
// Chat logging type 'O' / Global Chat
- if( log_config.chat&1 && !(agit_flag && log_config.chat&32) )
+ if( log_config.chat&1 || (log_config.chat&2 && !(agit_flag && log_config.chat&64)) )
log_chat("O", 0, sd->status.char_id, sd->status.account_id, mapindex_id2name(sd->mapindex), sd->bl.x, sd->bl.y, NULL, message);
return;
@@ -8818,7 +8818,7 @@ void clif_parse_Wis(int fd, struct map_session_data* sd)
target[NAME_LENGTH]='\0';
// Chat logging type 'W' / Whisper
- if( log_config.chat&2 && !(agit_flag && log_config.chat&32) )
+ if( log_config.chat&1 || (log_config.chat&4 && !(agit_flag && log_config.chat&64)) )
log_chat("W", 0, sd->status.char_id, sd->status.account_id, mapindex_id2name(sd->mapindex), sd->bl.x, sd->bl.y, target, msg);
//-------------------------------------------------------//
diff --git a/src/map/guild.c b/src/map/guild.c
index 74cd0261a..3207dd398 100644
--- a/src/map/guild.c
+++ b/src/map/guild.c
@@ -1005,7 +1005,7 @@ int guild_send_message(struct map_session_data *sd,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&8 && !(agit_flag && log_config.chat&32) )
+ if( log_config.chat&1 || (log_config.chat&16 && !(agit_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);
return 0;
diff --git a/src/map/log.c b/src/map/log.c
index 40225e7b7..5c061b90f 100644
--- a/src/map/log.c
+++ b/src/map/log.c
@@ -362,19 +362,18 @@ int log_npc(struct map_session_data* sd, const char* message)
int log_chat(const char* type, int type_id, int src_charid, int src_accid, const char* map, int x, int y, const char* dst_charname, const char* message)
{
- //FIXME: the actual filtering is being done by the calling code instead of in here, why!?
-
// Log CHAT (Global, Whisper, Party, Guild, Main chat)
// LOGGING FILTERS [Lupus]
- //=============================================================
- //00 = Don't log at all
- //Advanced Filter Bits: ||
- //01 - Log Global messages
- //02 - Log Whisper messages
- //04 - Log Party messages
- //08 - Log Guild messages
- //16 - Log Main chat messages
- //32 - Don't log anything when WOE is on
+ // =============================================================
+ // 0 = Don't log at all
+ // 1 = Log EVERYTHING!
+ // Advanced Filter Bits: ||
+ // 02 - Log Global messages
+ // 04 - Log Whisper messages
+ // 08 - Log Party messages
+ // 16 - Log Guild messages
+ // 32 - Log Main chat messages
+ // 64 - Don't log anything when WOE is on
//Check ON/OFF
if(log_config.chat <= 0)
diff --git a/src/map/party.c b/src/map/party.c
index 284f00a77..020d02e22 100644
--- a/src/map/party.c
+++ b/src/map/party.c
@@ -600,7 +600,7 @@ int party_send_message(struct map_session_data *sd,char *mes,int len)
party_recv_message(sd->status.party_id,sd->status.account_id,mes,len);
// Chat logging type 'P' / Party Chat
- if( log_config.chat&4 && !(agit_flag && log_config.chat&32) )
+ if( log_config.chat&1 || (log_config.chat&8 && !(agit_flag && log_config.chat&64)) )
log_chat("P", sd->status.party_id, sd->status.char_id, sd->status.account_id, mapindex_id2name(sd->mapindex), sd->bl.x, sd->bl.y, NULL, mes);
return 0;