X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=src%2Fserver%2Fmain.c;h=3c8829b7067ec010267382f27d80b04d9da47bcf;hb=cc4ed0c49279f08a053a3e3a9a4acba22283a01f;hp=6cf6b413bc7c92215cd4b4ecd1386d28d6f88575;hpb=dd9d65ee727ac7e95801da0f8b5bae7009811802;p=plomrogue
diff --git a/src/server/main.c b/src/server/main.c
index 6cf6b41..3c8829b 100644
--- a/src/server/main.c
+++ b/src/server/main.c
@@ -1,16 +1,13 @@
/* src/server/main.c */
-#include /* global errno */
#include /* printf() */
#include /* exit() */
-#include /* mkfifo(), mkdir() */
-#include /* access() */
-#include "../common/rexit.h" /* exit_err, exit_trouble(), set_cleanup_func() */
+#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() */
-#include "map_object_actions.h" /* init_map_object_actions() */
-#include "map_objects.h" /* init_map_object_defs() */
-#include "run.h" /* obey_argv(), run_game() */
+#include "init.h" /* run_game(), obey_argv(), obey_argv(), setup_server_io(),
+ * init_map_and_map_object_configs()
+ */
#include "world.h" /* struct World */
@@ -21,8 +18,6 @@ struct World world;
int main(int argc, char ** argv)
{
- char * f_name = "main()";
-
/* So error exits also go through the server's cleanup() function. */
set_cleanup_func(cleanup);
@@ -40,23 +35,17 @@ int main(int argc, char ** argv)
exit_err(-1 == test, printf_err);
}
}
- world.path_in = "server/in";
- world.path_out = "server/out";
- world.path_record = "record";
- world.tmp_suffix = "_tmp";
-
- /* Treat world.path_in file as server process lock file. */
- char * err = "Found pre-existing input fifo file. This indicates another "
- "roguelike-server may be running. It should be killed first.";
- exit_err(!access(world.path_in, F_OK), err);
- int test = mkdir("server", 0700);
- exit_trouble(test && EEXIST != errno, f_name, "mkdir()");
- exit_trouble(mkfifo(world.path_in, 0600), f_name, "mkfifo()");
- set_cleanup_flag(CLEANUP_FIFO);
-
- /* Init from config files map object (action) definitions. */
- init_map_object_defs("confserver/defs");
- init_map_object_actions("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();
+ setup_server_io();
/* Enter play or replay mode loops, then leave properly. */
run_game();