X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=sidebyside;f=src%2Fserver%2Fmain.c;h=642a6fe5179c4f618d0b4aae7de148eb9177f3f1;hb=c53b42dfc7e4de104f9189428dd5b9a0d431c00a;hp=0c1e6394d1ba963efd4d30c658b727dc5397b691;hpb=1a8b80508bc0bc6d9e9d3f8c48a8c7c40675c61f;p=plomrogue diff --git a/src/server/main.c b/src/server/main.c index 0c1e639..642a6fe 100644 --- a/src/server/main.c +++ b/src/server/main.c @@ -2,7 +2,6 @@ #include /* printf() */ #include /* 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(), @@ -35,14 +34,12 @@ 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_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();