diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-04 16:38:54 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-04 16:38:54 +0000 |
| commit | dca477622e54f10689d47969153121734a411a2d (patch) | |
| tree | 1a7affc325c8e5faac6dfa678dcf86c5c2b57127 /src/map/log.c | |
| parent | 57286000fb15cc498f1bcd240afee63102eadf45 (diff) | |
| download | hercules-dca477622e54f10689d47969153121734a411a2d.tar.gz hercules-dca477622e54f10689d47969153121734a411a2d.tar.bz2 hercules-dca477622e54f10689d47969153121734a411a2d.tar.xz hercules-dca477622e54f10689d47969153121734a411a2d.zip | |
- Enabled Mastery damage on Soul Breaker again, moved adv katar mastery out of the mastery function so that it may apply to all skills except Soul Breaker.
- Changed name of the setting log_pick to log_filter since that's what it does now.
- Modified enable_logs so that instead of a 0/1 setting, you can specify which kind of events to log (so you can use a combination), see log_athena for the bitmask configuration.
- Cleaned a bit the contents of log_athena.conf
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8129 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/log.c')
| -rw-r--r-- | src/map/log.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/map/log.c b/src/map/log.c index 08a20b456..c850bab65 100644 --- a/src/map/log.c +++ b/src/map/log.c @@ -105,11 +105,9 @@ int log_pick(struct map_session_data *sd, char *type, int mob_id, int nameid, in char *mapname;
int obj_id;
- if(log_config.enable_logs <= 0)
- return 0;
nullpo_retr(0, sd);
//Should we log this item? [Lupus]
- if (!should_log_item(log_config.pick,nameid, amount))
+ if (!should_log_item(log_config.filter,nameid, amount))
return 0; //we skip logging this items set - they doesn't met our logging conditions [Lupus]
//either PLAYER or MOB (here we get map name and objects ID)
@@ -396,6 +394,8 @@ int log_config_read(char *cfgName) {
if(strcmpi(w1,"enable_logs") == 0) {
log_config.enable_logs = (atoi(w2));
+ if (log_config.enable_logs&1) //Log everything.
+ log_config.enable_logs=0xFFFFFFFF;
} else if(strcmpi(w1,"sql_logs") == 0) {
log_config.sql_logs = (atoi(w2));
//start of common filter settings
@@ -410,8 +410,8 @@ int log_config_read(char *cfgName) //end of common filter settings
} else if(strcmpi(w1,"log_branch") == 0) {
log_config.branch = (atoi(w2));
- } else if(strcmpi(w1,"log_pick") == 0) {
- log_config.pick = (atoi(w2));
+ } else if(strcmpi(w1,"log_filter") == 0) {
+ log_config.filter = (atoi(w2));
} else if(strcmpi(w1,"log_zeny") == 0) {
log_config.zeny = (atoi(w2));
} else if(strcmpi(w1,"log_gm") == 0) {
@@ -431,7 +431,7 @@ int log_config_read(char *cfgName) ShowNotice("Logging Dead Branch Usage to table `%s`\n", w2);
} else if(strcmpi(w1, "log_pick_db") == 0) {
strcpy(log_config.log_pick_db, w2);
- if(log_config.pick == 1)
+ if(log_config.filter)
ShowNotice("Logging Item Picks to table `%s`\n", w2);
} else if(strcmpi(w1, "log_zeny_db") == 0) {
strcpy(log_config.log_zeny_db, w2);
@@ -462,7 +462,7 @@ int log_config_read(char *cfgName) ShowNotice("Logging Dead Branch Usage to file `%s`.txt\n", w2);
} else if(strcmpi(w1, "log_pick_file") == 0) {
strcpy(log_config.log_pick, w2);
- if(log_config.pick > 0 && log_config.sql_logs < 1)
+ if(log_config.filter > 0 && log_config.sql_logs < 1)
ShowNotice("Logging Item Picks to file `%s`.txt\n", w2);
} else if(strcmpi(w1, "log_zeny_file") == 0) {
strcpy(log_config.log_zeny, w2);
|