diff options
| author | brianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-04-29 20:32:21 +0000 |
|---|---|---|
| committer | brianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-04-29 20:32:21 +0000 |
| commit | 354a65564f48113c78f886f9df3329abd8bfd756 (patch) | |
| tree | 107b7e9d0df618fadca23150fbbceb4f8c8ba517 /src | |
| parent | 20990141f99acddc43e09c4090eff120a435719b (diff) | |
| download | hercules-354a65564f48113c78f886f9df3329abd8bfd756.tar.gz hercules-354a65564f48113c78f886f9df3329abd8bfd756.tar.bz2 hercules-354a65564f48113c78f886f9df3329abd8bfd756.tar.xz hercules-354a65564f48113c78f886f9df3329abd8bfd756.zip | |
- Removed leftover TXT configs, follow-up to r15503.
- Edited more ***_config_read() functions to show a warning if "Unknown setting" is found.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16009 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
| -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 |
5 files changed, 12 insertions, 3 deletions
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); |