diff options
| author | Guilherme Menaldo <guilherme.menaldo@outlook.com> | 2019-10-01 22:57:09 -0300 |
|---|---|---|
| committer | Guilherme Menaldo <guilherme.menaldo@outlook.com> | 2019-10-05 16:42:54 -0300 |
| commit | 7d25827001493a82a8f75cfc6a0b956164b44f05 (patch) | |
| tree | 911eff2691b6804c6a971bd86234313ee1af7dcf /src/map/map.c | |
| parent | d026e28fd78f60dfa21da381f17f2a8cc9ae3d11 (diff) | |
| download | hercules-7d25827001493a82a8f75cfc6a0b956164b44f05.tar.gz hercules-7d25827001493a82a8f75cfc6a0b956164b44f05.tar.bz2 hercules-7d25827001493a82a8f75cfc6a0b956164b44f05.tar.xz hercules-7d25827001493a82a8f75cfc6a0b956164b44f05.zip | |
Dehardcodes db files base path so the db folder can be easily moved
Diffstat (limited to 'src/map/map.c')
| -rw-r--r-- | src/map/map.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/map/map.c b/src/map/map.c index 332bbe75f..ebd5b068c 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -4055,6 +4055,7 @@ static bool map_config_read_database(const char *filename, struct config_t *conf return false; } libconfig->setting_lookup_mutable_string(setting, "db_path", map->db_path, sizeof(map->db_path)); + libconfig->set_db_path(map->db_path); libconfig->setting_lookup_int(setting, "save_settings", &map->save_settings); if (libconfig->setting_lookup_int(setting, "autosave_time", &map->autosave_interval) == CONFIG_TRUE) { @@ -5574,12 +5575,8 @@ static void read_map_zone_db(void) { struct config_t map_zone_db; struct config_setting_t *zones = NULL; - /* TODO: #ifndef required for re/pre-re */ -#ifdef RENEWAL - const char *config_filename = "db/re/map_zone_db.conf"; // FIXME hardcoded name -#else - const char *config_filename = "db/pre-re/map_zone_db.conf"; // FIXME hardcoded name -#endif + char config_filename[256]; + libconfig->format_db_path(DBPATH"map_zone_db.conf", config_filename, sizeof(config_filename)); if (!libconfig->load_file(&map_zone_db, config_filename)) return; @@ -6774,6 +6771,7 @@ void map_defaults(void) map->extra_scripts_count = 0; sprintf(map->db_path ,"db"); + libconfig->set_db_path(map->db_path); sprintf(map->help_txt ,"conf/help.txt"); sprintf(map->charhelp_txt ,"conf/charhelp.txt"); |