diff options
author | Kenpachi Developer <Kenpachi.Developer@gmx.de> | 2020-05-11 01:33:39 +0200 |
---|---|---|
committer | Kenpachi Developer <Kenpachi.Developer@gmx.de> | 2020-05-12 06:33:06 +0200 |
commit | d80274aa9483c6d2d0e1a70b85f654a7d0eddb04 (patch) | |
tree | 98aa9cfadcd0e8c08042fe5607ad4a0595c3e97d /src/map/map.c | |
parent | 94155c04e142ed5e441ffd4f07ff85290e5b4cd5 (diff) | |
download | hercules-d80274aa9483c6d2d0e1a70b85f654a7d0eddb04.tar.gz hercules-d80274aa9483c6d2d0e1a70b85f654a7d0eddb04.tar.bz2 hercules-d80274aa9483c6d2d0e1a70b85f654a7d0eddb04.tar.xz hercules-d80274aa9483c6d2d0e1a70b85f654a7d0eddb04.zip |
Remove old mapreg table related code and config
Diffstat (limited to 'src/map/map.c')
-rw-r--r-- | src/map/map.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/map/map.c b/src/map/map.c index d9be46bfb..63d05c1c0 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -4459,7 +4459,6 @@ static bool inter_config_read_connection(const char *filename, const struct conf static bool inter_config_read_database_names(const char *filename, const struct config_t *config, bool imported) { const struct config_setting_t *setting = NULL; - bool retval = true; nullpo_retr(false, filename); nullpo_retr(false, config); @@ -4477,20 +4476,14 @@ static bool inter_config_read_database_names(const char *filename, const struct libconfig->setting_lookup_mutable_string(setting, "npc_barter_data_db", map->npc_barter_data_db, sizeof(map->npc_barter_data_db)); libconfig->setting_lookup_mutable_string(setting, "npc_expanded_barter_data_db", map->npc_expanded_barter_data_db, sizeof(map->npc_expanded_barter_data_db)); - if (!mapreg->config_read(filename, setting, imported)) - retval = false; - if ((setting = libconfig->lookup(config, "inter_configuration/database_names/registry")) == NULL) { if (imported) - return retval; + return true; ShowError("inter_config_read: inter_configuration/database_names/registry was not found in %s!\n", filename); return false; } - if (!mapreg->config_read_registry(filename, setting, imported)) - retval = false; - - return retval; + return mapreg->config_read_registry(filename, setting, imported); } /*======================================= |