diff options
| author | Haru <haru@dotalux.com> | 2016-02-12 12:43:14 +0100 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2016-08-19 21:32:23 +0200 |
| commit | aa3a3f43b677f1646cc53f7a89ad11cdfd2fcc57 (patch) | |
| tree | 764ef66928897fa988ca6ac9138a0d7852056080 /src/map/map.c | |
| parent | 3f85b17f494a465daaf0cc8acb151d5d4ebbaa5d (diff) | |
| download | hercules-aa3a3f43b677f1646cc53f7a89ad11cdfd2fcc57.tar.gz hercules-aa3a3f43b677f1646cc53f7a89ad11cdfd2fcc57.tar.bz2 hercules-aa3a3f43b677f1646cc53f7a89ad11cdfd2fcc57.tar.xz hercules-aa3a3f43b677f1646cc53f7a89ad11cdfd2fcc57.zip | |
Ported script.conf to libconfig
Ported to modern Hercules and cleaned up from Panikon's commits: a0e4da63ef3afcd896603398e2468876681ac54a, b5f487c2676833492a6d4044b5d1f1bb1e552b04
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'src/map/map.c')
| -rw-r--r-- | src/map/map.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/map/map.c b/src/map/map.c index 9be68bdf5..afb81c33c 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -6369,7 +6369,7 @@ int do_init(int argc, char *argv[]) map->MAP_CONF_NAME = aStrdup("conf/map/map-server.conf"); map->BATTLE_CONF_FILENAME = aStrdup("conf/battle.conf"); map->ATCOMMAND_CONF_FILENAME = aStrdup("conf/atcommand.conf"); - map->SCRIPT_CONF_NAME = aStrdup("conf/script.conf"); + map->SCRIPT_CONF_NAME = aStrdup("conf/map/script.conf"); map->MSG_CONF_NAME = aStrdup("conf/messages.conf"); map->GRF_PATH_FILENAME = aStrdup("conf/grf-files.txt"); @@ -6400,6 +6400,7 @@ int do_init(int argc, char *argv[]) CHECK_OLD_LOCAL_CONF("conf/import/map_conf.txt", "conf/import/map-server.conf"); CHECK_OLD_LOCAL_CONF("conf/import/inter_conf.txt", "conf/import/inter-server.conf"); CHECK_OLD_LOCAL_CONF("conf/import/log_conf.txt", "conf/import/logs.conf"); + CHECK_OLD_LOCAL_CONF("conf/import/script_conf.txt", "conf/import/script.conf"); #undef CHECK_OLD_LOCAL_CONF } @@ -6435,7 +6436,7 @@ int do_init(int argc, char *argv[]) map->inter_config_read(map->INTER_CONF_NAME, false); logs->config_read(map->LOG_CONF_NAME, false); } - script->config_read(map->SCRIPT_CONF_NAME); + script->config_read(map->SCRIPT_CONF_NAME, false); map->id_db = idb_alloc(DB_OPT_BASE); map->pc_db = idb_alloc(DB_OPT_BASE); //Added for reliable map->id2sd() use. [Skotlex] @@ -6596,7 +6597,7 @@ void map_defaults(void) { map->MAP_CONF_NAME = "conf/map/map-server.conf"; map->BATTLE_CONF_FILENAME = "conf/battle.conf"; map->ATCOMMAND_CONF_FILENAME = "conf/atcommand.conf"; - map->SCRIPT_CONF_NAME = "conf/script.conf"; + map->SCRIPT_CONF_NAME = "conf/map/script.conf"; map->MSG_CONF_NAME = "conf/messages.conf"; map->GRF_PATH_FILENAME = "conf/grf-files.txt"; |