summaryrefslogtreecommitdiff
path: root/src/map/map.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/map/map.c')
-rw-r--r--src/map/map.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/map/map.c b/src/map/map.c
index 3831f7e98..de71d0e84 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -3840,12 +3840,14 @@ int do_init(int argc, char *argv[])
}
map_config_read(MAP_CONF_NAME);
+ /* only temporary until sirius's datapack patch is complete */
+
#ifdef RENEWAL
- /**
- * to make pre-re conflict safe
- **/
- map_config_read("npc/scripts_renewal.conf");
+ map_config_read("npc/re/scripts_main.conf");
+#else
+ map_config_read("npc/pre-re/scripts_main.conf");
#endif
+
chrif_checkdefaultlogin();
if (!map_ip_set || !char_ip_set) {