Server: Read in former "config" data as normal server god commands.

[plomrogue] / src / server / main.c

diff --git a/src/server/main.c b/src/server/main.c
index 642a6fe5179c4f618d0b4aae7de148eb9177f3f1..c8ca499293999f32067b2c5a0afcc54dc34c8526 100644 (file)
--- a/src/server/main.c
+++ b/src/server/main.c
@@ -4,9 +4,8 @@
 #include <stdlib.h> /* exit() */
 #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 "hardcoded_strings.h" /* s */
+#include "init.h" /* run_game(), obey_argv(), obey_argv(), setup_server_io() */
 #include "world.h" /* struct World */
 
 
@@ -21,6 +20,7 @@ int main(int argc, char ** argv)
     set_cleanup_func(cleanup);
 
     /* Init settings from command line / hard-coded values. Print start info. */
+    init_strings();
     obey_argv(argc, argv);
     if (world.is_verbose)
     {
@@ -30,22 +30,14 @@ int main(int argc, char ** argv)
         if (world.replay)
         {
             test = printf("Replay mode. Auto-replaying up to turn %d.\n",
-                         world.replay);
+                          world.replay);
             exit_err(-1 == test, printf_err);
         }
     }
-    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";
-
-    /* Init map, map object configurations and server i/o files. */
-    init_map_and_map_objects_configs();
-    setup_server_io();
+    world.map.length = 64;                      /* Just a sane default value. */
 
-    /* Enter play or replay mode loops, then leave properly. */
+    /* Init server i/o, Enter play or replay mode loops, then leave properly. */
+    setup_server_io();
     run_game();
     cleanup();
     exit(EXIT_SUCCESS);