X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fserver%2Fmain.c;h=366fb17b8864abdb58e539098bc683f49bac5df5;hb=bfd1888150ed5345fb4552ccaa8f304ae4819980;hp=9bfddaecb4bb6d6a21ed5dc6435f55ddacaa4172;hpb=928ef02c73842f80cbf287bfb24fa97dff59072e;p=plomrogue

diff --git a/src/server/main.c b/src/server/main.c
index 9bfddae..366fb17 100644
--- a/src/server/main.c
+++ b/src/server/main.c
@@ -2,12 +2,10 @@
 
 #include <stdio.h> /* printf() */
 #include <stdlib.h> /* exit() */
-#include "../common/err_try_fgets.h" /* set_err_try_fgets_delim() */
 #include "../common/rexit.h" /* exit_err, set_cleanup_func() */
 #include "cleanup.h" /* set_cleanup_flag(), cleanup() */
-#include "init.h" /* run_game(), obey_argv(), obey_argv(), setup_server_io(),
-                   * init_map_and_map_object_configs()
-                   */
+#include "configfile.h" /* read_config_file() */
+#include "init.h" /* run_game(), obey_argv(), obey_argv(), setup_server_io() */
 #include "world.h" /* struct World */
 
 
@@ -35,17 +33,15 @@ int main(int argc, char ** argv)
             exit_err(-1 == test, printf_err);
         }
     }
-    world.path_map_obj_defs = "confserver/map_objects";
-    world.path_map_obj_acts = "confserver/map_object_actions";
+    world.path_config       = "confserver/world";
     world.path_worldstate   = "server/worldstate";
     world.path_out          = "server/out";
     world.path_in           = "server/in";
     world.path_record       = "record";
     world.tmp_suffix        = "_tmp";
-    set_err_try_fgets_delim("%%\n");
 
-    /* Init map, map object configurations and server i/o files. */
-    init_map_and_map_objects_configs();
+    /* Init config file and server i/o files. */
+    read_config_file();
     setup_server_io();
 
     /* Enter play or replay mode loops, then leave properly. */