summaryrefslogtreecommitdiff
path: root/src/map/quest.c
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2016-02-16 13:31:41 +0100
committerHaru <haru@dotalux.com>2016-02-17 10:40:43 +0100
commit5b673efa121320d1575e126243fa2c7ec460952d (patch)
tree609fa0a08bf4065a07ccb469039df43e96d095ee /src/map/quest.c
parent6c127b3ec4f73f02aff5b37e9526dcc249d95c54 (diff)
downloadhercules-5b673efa121320d1575e126243fa2c7ec460952d.tar.gz
hercules-5b673efa121320d1575e126243fa2c7ec460952d.tar.bz2
hercules-5b673efa121320d1575e126243fa2c7ec460952d.tar.xz
hercules-5b673efa121320d1575e126243fa2c7ec460952d.zip
Renamed config->read_file to config->load_file
- The return value is now consistent with the libconfig standard (CONFIG_TRUE/CONFIG_FALSE). - Removed some redundant error messages. Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'src/map/quest.c')
-rw-r--r--src/map/quest.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/map/quest.c b/src/map/quest.c
index 0dbea56f8..9af7c8ea2 100644
--- a/src/map/quest.c
+++ b/src/map/quest.c
@@ -533,7 +533,10 @@ int quest_read_db(void)
const char *filename = "quest_db.conf";
sprintf(filepath, "%s/%s", map->db_path, filename);
- if (libconfig->read_file(&quest_db_conf, filepath) || !(qdb = libconfig->setting_get_member(quest_db_conf.root, "quest_db"))) {
+ if (!libconfig->load_file(&quest_db_conf, filepath))
+ return -1;
+
+ if ((qdb = libconfig->setting_get_member(quest_db_conf.root, "quest_db")) == NULL) {
ShowError("can't read %s\n", filepath);
return -1;
}