X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;f=src%2Fserver%2Fio.c;h=488f92bd34ac8a2923b1a500f2c3d8f1c9d94a98;hb=0438f2fc5df337e4264103a86c1765ace9c6565a;hp=ba5abd5f2d18b2c95000fe7381b244aae6df455f;hpb=7045b6f03025dfd0fecdd562fc267765a0072d6e;p=plomrogue

diff --git a/src/server/io.c b/src/server/io.c
index ba5abd5..488f92b 100644
--- a/src/server/io.c
+++ b/src/server/io.c
@@ -1,24 +1,26 @@
 /* src/server/io.c */
 
-#define _BSD_SOURCE /* usleep() */
+#define _POSIX_C_SOURCE 199309L
 #include "io.h"
 #include <errno.h> /* global errno */
 #include <limits.h> /* PIPE_BUF */
 #include <stddef.h> /* size_t, NULL */
-#include <stdint.h> /* uint8_t, uint32_t */
+#include <stdint.h> /* uint8_t, uint16_t, uint32_t */
 #include <stdio.h> /* defines EOF, FILE, sprintf() */
 #include <stdlib.h> /* free() */
-#include <string.h> /* strlen(), memcpy() */
+#include <string.h> /* strlen(), memcpy(), memset() */
 #include <sys/types.h> /* time_t */
-#include <time.h> /* time() */
-#include <unistd.h> /* usleep() */
-#include "../common/err_try_fgets.h" /* err_line() */
+#include <time.h> /* time(), nanosleep() */
 #include "../common/readwrite.h" /* try_fopen(), try_fclose_unlink_rename(),
                                   * try_fwrite(), try_fputc(), try_fgetc()
                                   */
 #include "../common/try_malloc.h" /* try_malloc() */
 #include "cleanup.h" /* set_cleanup_flag() */
-#include "map_objects.h" /* structs MapObj, MapObjDef, get_map_obj_def() */
+#include "field_of_view.h" /* VISIBLE */
+#include "map.h" /* yx_to_map_pos() */
+#include "map_objects.h" /* structs MapObj, MapObjDef, get_map_obj_def(),
+                          * get_player()
+                          */
 #include "world.h" /* global world  */
 
 
@@ -30,8 +32,8 @@
 */
 static char * get_message_from_queue();
 
-/* Read input file for input into world.queue. new queue input. Wait a few
- * seconds until giving up. Translate '\n' chars in input file into '\0' chars.
+/* Poll input file for world.queue input. Wait a few seconds until giving up;
+ * poll only every 0.03 seconds.. Translate '\n' chars in input file into '\0'.
  */
 static void read_file_into_queue();
 
@@ -46,10 +48,15 @@ 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);
 
-/* Write to "file" game map, with map objects super-imposed. Write one row per
- * \n-delimited line. Super-impose animated objects over inanimate objects.
+/* Return map cells sequence as visible to the "player", with invisible cells as
+ * whitespace. Super-impose over visible map cells map objects positioned there.
  */
-static void write_map(FILE * file);
+static char * build_visible_map(struct MapObj * 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);
 
 
 
@@ -93,10 +100,13 @@ static void read_file_into_queue()
     char * f_name = "read_file_into_queue()";
     uint8_t wait_seconds = 5;
     time_t now = time(0);
+    struct timespec dur;
+    dur.tv_sec = 0;
+    dur.tv_nsec = 33333333;
     int test;
     while (EOF == (test = try_fgetc(world.file_in, f_name)))
     {
-        usleep(33);
+        nanosleep(&dur, NULL);
         if (time(0) > now + wait_seconds)
         {
             return;
@@ -134,9 +144,8 @@ static void update_worldstate_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_map(file);
+    write_value_as_line(world.map.length, file);
+    write_map(player, file);
     if (world.log)
     {
         try_fwrite(world.log, strlen(world.log), 1, file, f_name);
@@ -186,12 +195,20 @@ static void write_inventory(struct MapObj * player, FILE * file)
 
 
 
-static void write_map(FILE * file)
+static char * build_visible_map(struct MapObj * player)
 {
-    char * f_name = "write_map()";
-    uint32_t map_size = world.map.size.y * world.map.size.x;
-    char visible_map[map_size];
-    memcpy(visible_map, world.map.cells, map_size);
+    char * f_name = "build_visible_map()";
+    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 (player->fov_map[pos_i] & VISIBLE)
+        {
+            visible_map[pos_i] = world.map.cells[pos_i];
+        }
+    }
     struct MapObj * o;
     struct MapObjDef * d;
     char c;
@@ -200,24 +217,35 @@ static void write_map(FILE * file)
     {
         for (o = world.map_objs; o != 0; o = o->next)
         {
-            if ((   (0 == i && 0 == o->lifepoints)
-                 || (1 == i && 0 < o->lifepoints)))
+            if (   player->fov_map[yx_to_map_pos(&o->pos)] & VISIBLE
+                && (   (0 == i && 0 == o->lifepoints)
+                    || (1 == i && 0 < o->lifepoints)))
             {
                 d = get_map_object_def(o->type);
                 c = d->char_on_map;
-                visible_map[(o->pos.y * world.map.size.x) + o->pos.x] = c;
+                visible_map[yx_to_map_pos(&o->pos)] = c;
             }
         }
     }
+    return visible_map;
+}
+
+
+
+static void write_map(struct MapObj * 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);
     }
+    free(visible_map);
 }