diff options
| -rw-r--r-- | conf/char_athena.conf | 52 | ||||
| -rw-r--r-- | src/common/plugins.c | 2 | ||||
| -rw-r--r-- | src/common/socket.c | 2 | ||||
| -rw-r--r-- | src/map/log.c | 2 | ||||
| -rw-r--r-- | src/map/map.c | 6 | ||||
| -rw-r--r-- | src/map/script.c | 3 |
6 files changed, 12 insertions, 55 deletions
diff --git a/conf/char_athena.conf b/conf/char_athena.conf index 498e406f9..7c0efa3a1 100644 --- a/conf/char_athena.conf +++ b/conf/char_athena.conf @@ -66,19 +66,6 @@ console_silent: 0 // This prevents usage of >& log.file console: off -// Option to force a player to create an e-mail. -// If a player have default e-mail, and if you activate this option, the player can only connect in the game (to arrive on a map) like follow: -// - Create at least 1 character -// - Select 1 character -// - Select DEL to enter his/her e-mail. (if OK is choosen, client says to the player: 'invalid e-mail') -// - If his/her e-mail is correct, the player enter in the game (an e-mail is saved definitively). -// - If his/her e-mail is incorrect, he/she have 'incorrect e-mail' and must select again DEL. -// - After entering in the game (when the player arrives on a map), DEL and SEL/OK button work normaly for all next connections. -// Resume: If a player have "incorrect/invalid e-mail" when he/she click on 'OK' button, -// the player must click 'DEL' button and register his/her NEW e-mail to enter in the game -// So, default is 0, because administrator must explain to their players before to activate this option. -email_creation: 0 - // Type of server. // No functional side effects at the moment. // Displayed next to the server name in the client. @@ -136,9 +123,6 @@ unknown_char_name: Unknown // To log the character server? log_char: 1 -// Log Filename -char_log_filename: log/char.log - // Allow or not identical name for characters but with a different case (upper/lower): // example: Test-test-TEST-TesT; Value: 0 not allowed (default), 1 allowed name_ignoring_case: no @@ -172,40 +156,4 @@ char_del_delay: 86400 // What folder the DB files are in (item_db.txt, etc.) db_path: db -//NOTE: The following online listing options are only for TXT servers. - -// Filename of the file which receives the online players list in text -online_txt_filename: online.txt - -// Filename of the file which receives the online players list, but in html version -online_html_filename: online.html - -// Choose how to display online players. -// (sorting operation with a lot of online players can take time on a slow computer) -// 0: no sorting (default) -// 1: by alphabetical order of their name -// 2: by number of their zenys -// 3: by their base level -// 4: by their job (and job level inside the same job) -// 5: by alphabetical order of their actual map location -online_sorting_option: 0 - -// Choose which columns that you want display in the online files. Do the addition of these values: -// (if value is 0, no file is done) -// 1: name (just the name, no function like 'GM') -// 2: job -// 4: levels -// 8: map name -// 16: mapname and coordonates -// 32: zenys -// 64: name (with 'GM' if the player is a GM) -// default value: 1 (only name) -online_display_option: 1 - -// minimum GM level to display 'GM' when we want to display it (default: 1) -online_gm_display_min_level: 20 - -// refresh time (in sec) of the html file in the explorer (default 20) -online_refresh_html: 20 - import: conf/import/char_conf.txt diff --git a/src/common/plugins.c b/src/common/plugins.c index 937ec0aaa..5e021f35e 100644 --- a/src/common/plugins.c +++ b/src/common/plugins.c @@ -325,6 +325,8 @@ static int plugins_config_read(const char *cfgName) plugin_load(filename); } else if( strcmpi(w1,"import") == 0 ) plugins_config_read(w2); + else + ShowWarning("Unknown setting '%s' in file %s\n", w1, cfgName); } fclose(fp); return 0; diff --git a/src/common/socket.c b/src/common/socket.c index 592755d5a..9f781f7b7 100644 --- a/src/common/socket.c +++ b/src/common/socket.c @@ -1111,6 +1111,8 @@ int socket_config_read(const char* cfgName) #endif else if (!strcmpi(w1, "import")) socket_config_read(w2); + else + ShowWarning("Unknown setting '%s' in file %s\n", w1, cfgName); } fclose(fp); diff --git a/src/map/log.c b/src/map/log.c index 4d4fa166a..de3c850f3 100644 --- a/src/map/log.c +++ b/src/map/log.c @@ -488,6 +488,8 @@ int log_config_read(const char* cfgName) //support the import command, just like any other config else if( strcmpi(w1,"import") == 0 ) log_config_read(w2); + else + ShowWarning("Unknown setting '%s' in file %s\n", w1, cfgName); } } diff --git a/src/map/map.c b/src/map/map.c index 938f46582..cfd50137a 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -3345,12 +3345,12 @@ int map_config_read(char *cfgName) if (strcmpi(w1, "use_grf") == 0) enable_grf = config_switch(w2); else - if (strcmpi(w1, "import") == 0) - map_config_read(w2); - else if (strcmpi(w1, "console_msg_log") == 0) console_msg_log = atoi(w2);//[Ind] else + if (strcmpi(w1, "import") == 0) + map_config_read(w2); + else ShowWarning("Unknown setting '%s' in file %s\n", w1, cfgName); } diff --git a/src/map/script.c b/src/map/script.c index 4b3ab3d93..ca1659a90 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -3814,6 +3814,9 @@ int script_config_read(char *cfgName) else if(strcmpi(w1,"import")==0){ script_config_read(w2); } + else { + ShowWarning("Unknown setting '%s' in file %s\n", w1, cfgName); + } } fclose(fp); |