X-Git-Url: https://plomlompom.com/repos/%7B%7Bprefix%7D%7D/copy_structured?a=blobdiff_plain;f=src%2Fserver%2Fio.c;h=8b09ec0f8bdf4c8b898d1e7f15947d8390442f13;hb=d92f16d5959fc846d3eaf669517eecb3969cda08;hp=7fbb511055b2e30842a24b713bcfb5502dbf42ae;hpb=639a12151eeb7ce0d18de330b4bb8d9d8094c4d3;p=plomrogue

diff --git a/src/server/io.c b/src/server/io.c
index 7fbb511..8b09ec0 100644
--- a/src/server/io.c
+++ b/src/server/io.c
@@ -16,9 +16,9 @@
                                   */
 #include "../common/try_malloc.h" /* try_malloc() */
 #include "cleanup.h" /* set_cleanup_flag() */
-#include "field_of_view.h" /* VISIBLE, build_fov_map() */
+#include "field_of_view.h" /* VISIBLE */
 #include "map.h" /* yx_to_map_pos() */
-#include "map_objects.h" /* structs MapObj, MapObjDef, get_map_obj_def() */
+#include "things.h" /* Thing, ThingType, get_thing_type(), get_player() */
 #include "world.h" /* global world  */
 
 
@@ -44,17 +44,17 @@ static void update_worldstate_file();
 static void write_value_as_line(uint32_t value, FILE * file);
 
 /* Write to "file" player's inventory, one item name per line. End in "%\n". */
-static void write_inventory(struct MapObj * player, FILE * file);
+static void write_inventory(struct Thing * player, FILE * file);
 
 /* Return map cells sequence as visible to the "player", with invisible cells as
- * whitespace. Super-impose over visible map cells map objects positioned there.
+ * whitespace. Super-impose over visible map cells things positioned there.
  */
-static char * build_visible_map(struct MapObj * player);
+static char * build_visible_map(struct Thing * player);
 
 /* Write to "file" game map as visible to "player", build_visible_map()-drawn.
  * Write one row per \n-delimited line.
  */
-static void write_map(struct MapObj * player, FILE * file);
+static void write_map(struct Thing * player, FILE * file);
 
 
 
@@ -136,14 +136,13 @@ static void update_worldstate_file()
     char path_tmp[strlen(world.path_worldstate) + strlen(world.tmp_suffix) + 1];
     sprintf(path_tmp, "%s%s", world.path_worldstate, world.tmp_suffix);
     FILE * file = try_fopen(path_tmp, "w", f_name);
-    struct MapObj * player = get_player();
+    struct Thing * player = get_player();
     write_value_as_line(world.turn, file);
     write_value_as_line(player->lifepoints, file);
     write_inventory(player, file);
     write_value_as_line(player->pos.y, file);
     write_value_as_line(player->pos.x, file);
-    write_value_as_line(world.map.size.y, file);
-    write_value_as_line(world.map.size.x, file);
+    write_value_as_line(world.map.length, file);
     write_map(player, file);
     if (world.log)
     {
@@ -168,10 +167,10 @@ static void write_value_as_line(uint32_t value, FILE * file)
 
 
 
-static void write_inventory(struct MapObj * player, FILE * file)
+static void write_inventory(struct Thing * player, FILE * file)
 {
     char * f_name = "write_inventory()";
-    struct MapObj * owned = player->owns;
+    struct Thing * owned = player->owns;
     if (NULL == owned)
     {
         char * empty = "(none)\n";
@@ -182,8 +181,8 @@ static void write_inventory(struct MapObj * player, FILE * file)
         uint8_t q;
         for (q = 0; NULL != owned; q++)
         {
-            struct MapObjDef * mod = get_map_object_def(owned->type);
-            try_fwrite(mod->name, strlen(mod->name), 1, file, f_name);
+            struct ThingType * tt = get_thing_type(owned->type);
+            try_fwrite(tt->name, strlen(tt->name), 1, file, f_name);
             try_fputc('\n', file, f_name);
             owned = owned->next;
         }
@@ -194,55 +193,53 @@ static void write_inventory(struct MapObj * player, FILE * file)
 
 
 
-static char * build_visible_map(struct MapObj * player)
+static char * build_visible_map(struct Thing * player)
 {
     char * f_name = "build_visible_map()";
-    uint8_t * fov_map = build_fov_map(player);
-    uint32_t map_size = world.map.size.y * world.map.size.x;
+    uint32_t map_size = world.map.length * world.map.length;
     char * visible_map = try_malloc(map_size, f_name);
     memset(visible_map, ' ', map_size);
     uint16_t pos_i;
     for (pos_i = 0; pos_i < map_size; pos_i++)
     {
-        if (fov_map[pos_i] & VISIBLE)
+        if (player->fov_map[pos_i] & VISIBLE)
         {
             visible_map[pos_i] = world.map.cells[pos_i];
         }
     }
-    struct MapObj * o;
-    struct MapObjDef * d;
+    struct Thing * t;
+    struct ThingType * tt;
     char c;
     uint8_t i;
     for (i = 0; i < 2; i++)
     {
-        for (o = world.map_objs; o != 0; o = o->next)
+        for (t = world.things; t != 0; t = t->next)
         {
-            if (   fov_map[yx_to_map_pos(&o->pos)] & VISIBLE
-                && (   (0 == i && 0 == o->lifepoints)
-                    || (1 == i && 0 < o->lifepoints)))
+            if (   player->fov_map[yx_to_map_pos(&t->pos)] & VISIBLE
+                && (   (0 == i && 0 == t->lifepoints)
+                    || (1 == i && 0 < t->lifepoints)))
             {
-                d = get_map_object_def(o->type);
-                c = d->char_on_map;
-                visible_map[yx_to_map_pos(&o->pos)] = c;
+                tt = get_thing_type(t->type);
+                c = tt->char_on_map;
+                visible_map[yx_to_map_pos(&t->pos)] = c;
             }
         }
     }
-    free(fov_map);
     return visible_map;
 }
 
 
 
-static void write_map(struct MapObj * player, FILE * file)
+static void write_map(struct Thing * player, FILE * file)
 {
     char * f_name = "write_map()";
     char * visible_map = build_visible_map(player);
     uint16_t x, y;
-    for (y = 0; y < world.map.size.y; y++)
+    for (y = 0; y < world.map.length; y++)
     {
-        for (x = 0; x < world.map.size.x; x++)
+        for (x = 0; x < world.map.length; x++)
         {
-            try_fputc(visible_map[(y * world.map.size.x) + x], file, f_name);
+            try_fputc(visible_map[(y * world.map.length) + x], file, f_name);
         }
         try_fputc('\n', file, f_name);
     }