X-Git-Url: https://plomlompom.com/repos/%7B%7Bprefix%7D%7D/copy_structured?a=blobdiff_plain;f=src%2Fserver%2Finit.c;h=9f2a4e9f7b35af10ce0e26a8bb236eb11366be31;hb=c5b561a819b971151d824e0aa9622f6fc074ff28;hp=75b224c5aa0ec1f0bdb555b6f075a9eb12bce644;hpb=1a8b80508bc0bc6d9e9d3f8c48a8c7c40675c61f;p=plomrogue

diff --git a/src/server/init.c b/src/server/init.c
index 75b224c..9f2a4e9 100644
--- a/src/server/init.c
+++ b/src/server/init.c
@@ -1,12 +1,13 @@
 /* src/server/init.c */
 
+#define _POSIX_C_SOURCE 2 /* getopt(), optarg */
 #include "init.h"
 #include <errno.h> /* global errno, EEXIST */
 #include <stddef.h> /* NULL */
 #include <stdint.h> /* uint32_t */
-#include <stdio.h> /* sprintf(), fflush() */
-#include <stdlib.h> /* exit(), free() */
-#include <string.h> /* atoi(), strlen() */
+#include <stdio.h> /* FILE, sprintf(), fflush() */
+#include <stdlib.h> /* exit(), free(), atoi() */
+#include <string.h> /* strlen() */
 #include <sys/stat.h> /* mkdir() */
 #include <sys/types.h> /* defines pid_t, time_t */
 #include <time.h> /* time() */
@@ -17,11 +18,8 @@
 #include "../common/rexit.h" /* exit_err() */
 #include "../common/try_malloc.h" /* try_malloc() */
 #include "cleanup.h" /* set_cleanup_flag() */
-#include "map_object_actions.h" /* init_map_object_actions() */
-#include "map_objects.h" /* free_map_objects(), add_map_objects(),
-                          * init_map_object_defs()
-                          */
 #include "map.h" /* init_map() */
+#include "map_objects.h" /* free_map_objects(), add_map_objects() */
 #include "rrand.h" /* rrand() */
 #include "run.h" /* obey_msg(), io_loop() */
 #include "world.h" /* global world */
@@ -54,22 +52,6 @@ extern void obey_argv(int argc, char * argv[])
 
 
 
-extern void init_map_and_map_objects_configs()
-{
-    world.map.size.x = 64;
-    world.map.size.y = 64;
-    world.map.dist_orthogonal = 5;
-    world.map.dist_diagonal   = 7;
-    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);
-    init_map_object_defs();
-    init_map_object_actions();
-}
-
-
-
 extern void setup_server_io()
 {
     char * f_name = "setup_server_io()";