X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=inline;f=src%2Fserver%2Fmain.c;h=33e539102beded5802016eadea339ea40f2cc77e;hb=6489cfca32023a529f70960a089c73e282d73941;hp=0384ada9cda8e7519a18b5345828b466f5e417f7;hpb=6052be616897d692fc57ab15b56266b4b3f4668b;p=plomrogue
diff --git a/src/server/main.c b/src/server/main.c
index 0384ada..33e5391 100644
--- a/src/server/main.c
+++ b/src/server/main.c
@@ -1,17 +1,12 @@
/* 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 "hardcoded_strings.h" /* s */
+#include "init.h" /* run_game(), obey_argv(), obey_argv(), setup_server_io() */
#include "world.h" /* struct World */
@@ -22,12 +17,11 @@ 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);
/* Init settings from command line / hard-coded values. Print start info. */
+ init_strings();
obey_argv(argc, argv);
if (world.is_verbose)
{
@@ -41,32 +35,10 @@ 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");
-
- /* 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();
+ /* 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();