X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fserver%2Fio.c;h=0f7c3a8bd60367e5a338db65b6e2648227309b7e;hb=acdaf7a54812da8800a0e7cbaff17672057bdd0a;hp=0f65cea8c5e36060fa094af9eccd2f03629412b8;hpb=49ffd1e026de8e5175dbe52a24584fb00d9340aa;p=plomrogue

diff --git a/src/server/io.c b/src/server/io.c
index 0f65cea..0f7c3a8 100644
--- a/src/server/io.c
+++ b/src/server/io.c
@@ -1,4 +1,9 @@
-/* src/server/io.c */
+/* src/server/io.c
+ *
+ * This file is part of PlomRogue. PlomRogue is licensed under the GPL version 3
+ * or any later version. For details on its copyright, license, and warranties,
+ * see the file NOTICE in the root directory of the PlomRogue source package.
+ */
 
 #define _POSIX_C_SOURCE 200112L /* snrpintf() */
 #include "io.h"
@@ -18,8 +23,8 @@
 #include "../common/try_malloc.h" /* try_malloc() */
 #include "cleanup.h" /* set_cleanup_flag() */
 #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  */
 
@@ -67,7 +72,7 @@ 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);
 
@@ -165,6 +170,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__);
 }
@@ -278,7 +294,7 @@ static void write_value_as_line(uint32_t value, FILE * file)
 static void write_inventory(struct Thing * player, FILE * file)
 {
     struct Thing * owned = player->owns;
-    if (NULL == owned)
+    if (!owned)
     {
         char * empty = "(none)\n";
         try_fwrite(empty, strlen(empty), 1, file, __func__);
@@ -286,7 +302,7 @@ static void write_inventory(struct Thing * player, FILE * file)
     else
     {
         uint8_t q;
-        for (q = 0; NULL != owned; q++)
+        for (q = 0; owned; q++)
         {
             struct ThingType * tt = get_thing_type(owned->type);
             try_fwrite(tt->name, strlen(tt->name), 1, file, __func__);
@@ -354,14 +370,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; 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);
 }
 
 
@@ -417,6 +455,7 @@ extern void save_world()
         exit_trouble(test < 0, __func__, "fprintf");
         write_key_space_string(file, s[S_CMD_TT_NAME], tt->name);
         write_key_space_value(file, s[S_CMD_TT_CONSUM], tt->consumable);
+        write_key_space_value(file, s[S_CMD_TT_PROL], tt->proliferate);
         try_fputc('\n', file, __func__);
     }
     for (tt = world.thing_types; tt; tt = tt->next)