Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added back log_chat's '1 - log everything' setting (revert from r10850).

Browse Source 
Don't forget to adjust your config file ... again.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11289 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
ultramage 2007-09-24 22:33:50 +00:00
parent 1a91ca358c
commit c5b8e5d082
7 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
conf/Changelog.txt
View File

@ -1,5 +1,8 @@
Date Added Date Added
2007/09/24
* Added log_chat's '1 - log everything' (revert from r10850) [ultramage]
- don't forget to adjust your config file ... again.
2007/09/18 2007/09/18
* Rev. 11241 Added new maps to maps_athena.conf, and corresponding mapflags. [L0ne_W0lf] * Rev. 11241 Added new maps to maps_athena.conf, and corresponding mapflags. [L0ne_W0lf]
- Also added several missing maps, and cloned maps. - Also added several missing maps, and cloned maps.

22
conf/log_athena.conf
View File

@ -80,19 +80,19 @@ log_npc: 0
// Log CHAT (Global, Whisper, Party, Guild, Main chat) // Log CHAT (Global, Whisper, Party, Guild, Main chat)
// LOGGING FILTERS // LOGGING FILTERS
// ============================================================= // =============================================================
// 00 = Don't log at all // 0 = Don't log at all
// 1 = Log EVERYTHING!
// Advanced Filter Bits: || // Advanced Filter Bits: ||
// 01 - Log Global messages // 02 - Log Global messages
// 02 - Log Whisper messages // 04 - Log Whisper messages
// 04 - Log Party messages // 08 - Log Party messages
// 08 - Log Guild messages // 16 - Log Guild messages
// 16 - Log Main chat messages // 32 - Log Main chat messages
// 32 - Don't log anything when WOE is on // 64 - Don't log anything when WOE is on
// Example: // Example:
// log_chat: 6 = logs both Whisper & Party messages // log_chat: 12 = logs both Whisper & Party messages
// log_chat: 8 = logs only Guild messages // log_chat: 16 = logs only Guild messages
// log_chat: 34 = logs only Whisper, when WOE is off // log_chat: 68 = logs only Whisper, when WOE is off
// log_chat: 31 = logs EVERYTHING
log_chat: 0 log_chat: 0

2
src/map/atcommand.c
View File

@ -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); intif_announce(atcmd_output, strlen(atcmd_output) + 1, 0xFE000000, 0);
// Chat logging type 'M' / Main Chat // 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); log_chat("M", 0, sd->status.char_id, sd->status.account_id, mapindex_id2name(sd->mapindex), sd->bl.x, sd->bl.y, NULL, message);
} }

4
src/map/clif.c
View File

@ -8517,7 +8517,7 @@ void clif_parse_GlobalMessage(int fd, struct map_session_data* sd)
} }
// Chat logging type 'O' / Global Chat // 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); 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; return;
@ -8818,7 +8818,7 @@ void clif_parse_Wis(int fd, struct map_session_data* sd)
target[NAME_LENGTH]='\0'; target[NAME_LENGTH]='\0';
// Chat logging type 'W' / Whisper // 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); log_chat("W", 0, sd->status.char_id, sd->status.account_id, mapindex_id2name(sd->mapindex), sd->bl.x, sd->bl.y, target, msg);
//-------------------------------------------------------// //-------------------------------------------------------//

2
src/map/guild.c
View File

@ -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); guild_recv_message(sd->status.guild_id,sd->status.account_id,mes,len);
// Chat logging type 'G' / Guild Chat // 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); 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; return 0;

21
src/map/log.c
View File

@ -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) 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) // Log CHAT (Global, Whisper, Party, Guild, Main chat)
// LOGGING FILTERS [Lupus] // LOGGING FILTERS [Lupus]
//============================================================= // =============================================================
//00 = Don't log at all // 0 = Don't log at all
//Advanced Filter Bits: || // 1 = Log EVERYTHING!
//01 - Log Global messages // Advanced Filter Bits: ||
//02 - Log Whisper messages // 02 - Log Global messages
//04 - Log Party messages // 04 - Log Whisper messages
//08 - Log Guild messages // 08 - Log Party messages
//16 - Log Main chat messages // 16 - Log Guild messages
//32 - Don't log anything when WOE is on // 32 - Log Main chat messages
// 64 - Don't log anything when WOE is on
//Check ON/OFF //Check ON/OFF
if(log_config.chat <= 0) if(log_config.chat <= 0)

2
src/map/party.c
View File

@ -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); party_recv_message(sd->status.party_id,sd->status.account_id,mes,len);
// Chat logging type 'P' / Party Chat // 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); 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; return 0;