X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=src%2Fserver%2Fmain.c;h=366fb17b8864abdb58e539098bc683f49bac5df5;hb=57a981d4fc0a6f24116c8fad753df57e168551ed;hp=64d4434943867fb7a36d7b60da2759dae675dd41;hpb=e03020342a74aef143b1ec38c18966dac64181b5;p=plomrogue
diff --git a/src/server/main.c b/src/server/main.c
index 64d4434..366fb17 100644
--- a/src/server/main.c
+++ b/src/server/main.c
@@ -1,17 +1,11 @@
/* src/server/main.c */
-#include /* global errno */
#include /* printf() */
#include /* exit() */
-#include /* mkfifo(), mkdir() */
-#include /* access() */
-#include "../common/err_try_fgets.h" /* set_err_try_fgets_delim() */
-#include "../common/rexit.h" /* exit_err, exit_trouble(), set_cleanup_func() */
+#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 "configfile.h" /* read_config_file() */
+#include "init.h" /* run_game(), obey_argv(), obey_argv(), setup_server_io() */
#include "world.h" /* struct World */
@@ -22,8 +16,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);
@@ -41,38 +33,16 @@ int main(int argc, char ** argv)
exit_err(-1 == test, printf_err);
}
}
- world.path_map_obj_defs = "confserver/defs";
- world.path_map_obj_acts = "confserver/map_object_actions";
- world.path_in = "server/in";
- world.path_out = "server/out";
- world.path_record = "record";
- world.tmp_suffix = "_tmp";
- set_err_try_fgets_delim("%%\n");
-
- /* Set map geometry. */
- world.map.size.x = 64;
- world.map.size.y = 64;
- world.map.dist_orthogonal = 5;
- world.map.dist_diagonal = 7;
-
- /* Check existence of config files. */
- char * err_mod = "No map object definitions file.";
- char * err_moa = "No map object actions file.";
- exit_err(access(world.path_map_obj_defs, F_OK), err_mod);
- exit_err(access(world.path_map_obj_acts, F_OK), err_moa);
-
- /* 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();
- init_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";
+
+ /* Init config file and server i/o files. */
+ read_config_file();
+ setup_server_io();
/* Enter play or replay mode loops, then leave properly. */
run_game();