diff options
| author | Haru <haru@dotalux.com> | 2019-10-20 17:43:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-20 17:43:44 +0200 |
| commit | 275edef51c858e9e55934ec3af92ec19db74f3d3 (patch) | |
| tree | 81c4367dfb4d51fec9c71c2a407f502a514b6a67 /src/map/clif.c | |
| parent | ddd0e461fb8e451912a6aee90869023e2c2d8272 (diff) | |
| parent | be955e59bcd950d6430189a8a23a608927665c02 (diff) | |
| download | hercules-275edef51c858e9e55934ec3af92ec19db74f3d3.tar.gz hercules-275edef51c858e9e55934ec3af92ec19db74f3d3.tar.bz2 hercules-275edef51c858e9e55934ec3af92ec19db74f3d3.tar.xz hercules-275edef51c858e9e55934ec3af92ec19db74f3d3.zip | |
Merge pull request #2547 from guilherme-gm/201910-dehardcode-db
Dehardcode DB files path
Diffstat (limited to 'src/map/clif.c')
| -rw-r--r-- | src/map/clif.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index 3abbc2c36..9f30408e4 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -19794,7 +19794,8 @@ static void clif_cashshop_db(void) { struct config_t cashshop_conf; struct config_setting_t *cashshop = NULL, *cats = NULL; - const char *config_filename = "db/cashshop_db.conf"; // FIXME hardcoded name + char config_filename[256]; + libconfig->format_db_path("cashshop_db.conf", config_filename, sizeof(config_filename)); int i, item_count_t = 0; for( i = 0; i < CASHSHOP_TAB_MAX; i++ ) { CREATE(clif->cs.data[i], struct hCSData *, 1); @@ -21065,7 +21066,8 @@ static bool clif_parse_roulette_db(void) { struct config_t roulette_conf; struct config_setting_t *roulette = NULL, *levels = NULL; - const char *config_filename = "db/roulette_db.conf"; // FIXME hardcoded name + char config_filename[256]; + libconfig->format_db_path("roulette_db.conf", config_filename, sizeof(config_filename)); int i, j, item_count_t = 0; for( i = 0; i < MAX_ROULETTE_LEVEL; i++ ) { @@ -22549,7 +22551,8 @@ static bool clif_parse_attendance_db(void) { struct config_t attendance_conf; struct config_setting_t *attendance = NULL, *it = NULL; - const char *config_filename = "db/attendance_db.conf"; // FIXME hardcoded name + char config_filename[256]; + libconfig->format_db_path("attendance_db.conf", config_filename, sizeof(config_filename)); int i = 0; if (!libconfig->load_file(&attendance_conf, config_filename)) |