X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fserver%2Fio.c;h=8f8f738b46533dcbf099e08948f7524dc650e163;hb=3dedf6344c941891491773d1cc5d647aa664b218;hp=70a010780c9a97ba866c3c88f8f296134e0fc7b0;hpb=edebb2bf9aa780ee2f7006c1d2be9168564d34df;p=plomrogue

diff --git a/src/server/io.c b/src/server/io.c
index 70a0107..8f8f738 100644
--- a/src/server/io.c
+++ b/src/server/io.c
@@ -1,6 +1,6 @@
 /* src/server/io.c */
 
-#define _POSIX_C_SOURCE 199309L
+#define _POSIX_C_SOURCE 200112L /* snrpintf() */
 #include "io.h"
 #include <errno.h> /* global errno */
 #include <limits.h> /* PIPE_BUF */
@@ -17,10 +17,9 @@
 #include "../common/rexit.h" /* exit_trouble() */
 #include "../common/try_malloc.h" /* try_malloc() */
 #include "cleanup.h" /* set_cleanup_flag() */
-#include "field_of_view.h" /* VISIBLE */
 #include "hardcoded_strings.h" /* s */
-#include "things.h" /* Thing, ThingType, ThingAction, get_thing_type(),
-                     * get_player()
+#include "things.h" /* Thing, ThingType, ThingInMemory, ThingAction,
+                     * get_thing_type(), get_player()
                      */
 #include "world.h" /* global world  */
 
@@ -60,13 +59,15 @@ static void write_value_as_line(uint32_t value, 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 things positioned there.
+ * whitespace. Super-impose over visible map cells things positioned there,
+ * with animate things overwriting inanimate things, and inanimate consumable
+ * things overwriting inanimate non-consumable things.
  */
 static char * build_visible_map(struct Thing * player);
 
 /* Write to "file" game map as visible to "player" right now, as drawn by
  * build_visible_map(), and thereafter game map as memorized by player in its
- * .mem_map. Write one row per \n-delimited line.
+ * .mem_map and .t_mem. Write one row per \n-delimited line.
  */
 static void write_map(struct Thing * player, FILE * file);
 
@@ -164,6 +165,17 @@ static void write_thing(FILE * file, struct Thing * t)
             try_fputc('\n', file, __func__);
         }
         free(mem_map_copy);
+        struct ThingInMemory * tm = t->t_mem;
+        for (; tm; tm = tm->next)
+        {
+            write_key_space(file, s[S_CMD_T_MEMTHING]);
+            write_value(file, tm->type);
+            try_fputc(' ', file, __func__);
+            write_value(file, tm->pos.y);
+            try_fputc(' ', file, __func__);
+            write_value(file, tm->pos.x);
+            try_fputc('\n', file, __func__);
+        }
     }
     try_fputc('\n', file, __func__);
 }
@@ -309,27 +321,28 @@ static char * build_visible_map(struct Thing * player)
         uint32_t pos_i;
         for (pos_i = 0; pos_i < map_size; pos_i++)
         {
-            if (player->fov_map[pos_i] & VISIBLE)
+            if (player->fov_map[pos_i] == 'v')
             {
                 visible_map[pos_i] = world.map.cells[pos_i];
             }
         }
         struct Thing * t;
-        struct ThingType * tt;
         char c;
         uint8_t i;
-        for (i = 0; i < 2; i++)
+        for (i = 0; i < 3; i++)
         {
             for (t = world.things; t != 0; t = t->next)
             {
-                if (   (  player->fov_map[t->pos.y * world.map.length +t->pos.x]
-                        & VISIBLE)
-                    && (   (0 == i && 0 == t->lifepoints)
-                        || (1 == i && 0 < t->lifepoints)))
+                if ('v' == player->fov_map[t->pos.y*world.map.length+t->pos.x])
                 {
-                    tt = get_thing_type(t->type);
-                    c = tt->char_on_map;
-                    visible_map[t->pos.y * world.map.length + t->pos.x] = c;
+                    struct ThingType * tt = get_thing_type(t->type);
+                    if (   (0 == i && !t->lifepoints && !tt->consumable)
+                        || (1 == i && !t->lifepoints &&  tt->consumable)
+                        || (2 == i &&  t->lifepoints))
+                    {
+                        c = tt->char_on_map;
+                        visible_map[t->pos.y * world.map.length + t->pos.x] = c;
+                    }
                 }
             }
         }
@@ -352,14 +365,36 @@ static void write_map(struct Thing * player, FILE * file)
         try_fputc('\n', file, __func__);
     }
     free(visible_map);
+    uint32_t map_size = world.map.length * world.map.length;
+    char * mem_map = try_malloc(map_size, __func__);
+    memcpy(mem_map, player->mem_map, map_size);
+    uint8_t i;
+    struct ThingInMemory * tm;
+    for (i = 0; i < 2; i++)
+    {
+        for (tm = player->t_mem; tm != NULL; tm = tm->next)
+        {
+            if (' ' != player->mem_map[tm->pos.y*world.map.length+tm->pos.x])
+            {
+                struct ThingType * tt = get_thing_type(tm->type);
+                if (   (0 == i && !tt->consumable)
+                    || (1 == i &&  tt->consumable))
+                {
+                    char c = tt->char_on_map;
+                    mem_map[tm->pos.y * world.map.length + tm->pos.x] = c;
+                }
+            }
+        }
+    }
     for (y = 0; y < world.map.length; y++)
     {
         for (x = 0; x < world.map.length; x++)
         {
-            try_fputc(player->mem_map[y * world.map.length + x], file, __func__);
+            try_fputc(mem_map[y * world.map.length + x], file, __func__);
         }
         try_fputc('\n', file, __func__);
     }
+    free(mem_map);
 }