Server: Internally, rename "map object" stuff to "thing" stuff.

[plomrogue] / src / server / init.c

diff --git a/src/server/init.c b/src/server/init.c
index 75b224c5aa0ec1f0bdb555b6f075a9eb12bce644..a3c1589b6992c1af654e327f9b193e464329d62e 100644 (file)
--- 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,12 +18,11 @@
 #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 "field_of_view.h" /* build_fov_map() */
 #include "map.h" /* init_map() */
-#include "rrand.h" /* rrand() */
+#include "things.h" /* Thing, ThingType, free_things(), add_things(),
+                     * get_player()
+                     */
 #include "run.h" /* obey_msg(), io_loop() */
 #include "world.h" /* global world */
 
@@ -54,22 +54,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()";
@@ -98,20 +82,35 @@ extern void remake_world(uint32_t seed)
 {
     char * f_name = "remake_world()";
     free(world.log);
-    world.log = NULL;  /* map_object_action.c's update_log() checks for this. */
+    world.log = NULL;  /* thing_actions.c's update_log() checks for this. */
     world.seed = seed;
-    world.map_obj_count = 0;
+    world.thing_count = 0;
     free(world.map.cells);
-    free_map_objects(world.map_objs);
+    free_things(world.things);
     world.last_update_turn = 0;
     init_map();
-    add_map_objects(0, 1);
-    add_map_objects(1, 1 + rrand() % 27);
-    add_map_objects(2, 1 + rrand() % 9);
-    add_map_objects(3, 1 + rrand() % 3);
-    add_map_objects(4, 1 + rrand() % 3);
-    add_map_objects(5, 1 + rrand() % 3);
-    set_cleanup_flag(CLEANUP_MAP_OBJECTS);
+    struct ThingType * tt;
+    for (tt = world.thing_types; NULL != tt; tt = tt->next)
+    {
+        if (world.player_type == tt->id)
+        {
+            add_things(tt->id, tt->start_n);
+            break;
+        }
+    }
+    for (tt = world.thing_types; NULL != tt; tt = tt->next)
+    {
+        if (world.player_type != tt->id)
+        {
+            add_things(tt->id, tt->start_n);
+        }
+    }
+    set_cleanup_flag(CLEANUP_THINGS);
+    struct Thing * t;
+    for (t = world.things; NULL != t; t = t->next)
+    {
+        t->fov_map = t->lifepoints ? build_fov_map(t) : NULL;
+    }
     if (world.turn)
     {
         exit_trouble(unlink(world.path_record), f_name, "unlink()");