X-Git-Url: https://plomlompom.com/repos/processes?a=blobdiff_plain;f=src%2Fserver%2Fio.c;h=81251c1e4ff34612d7e1f9ecf6a964d23f8373bf;hb=a1b5e2eaa1136d6ee40d6ec2e262cfab368c5880;hp=c4c60478ec0253b1c17695e23006afb7baca49fb;hpb=c964473887d0ebe36c917e178e70cec8d0dcdba0;p=plomrogue

diff --git a/src/server/io.c b/src/server/io.c
index c4c6047..81251c1 100644
--- a/src/server/io.c
+++ b/src/server/io.c
@@ -1,6 +1,6 @@
 /* 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 */
@@ -10,14 +10,13 @@
 #include <stdlib.h> /* free() */
 #include <string.h> /* strlen(), memcpy() */
 #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 "field_of_view.h" /* build_visible_map() */
 #include "map_objects.h" /* structs MapObj, MapObjDef, get_map_obj_def() */
 #include "world.h" /* global world  */
 
@@ -46,8 +45,8 @@ 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.
+/* Write to "file" game map as visible to the player, build_visible_map()-drawn.
+ * Write one row per \n-delimited line.
  */
 static void write_map(FILE * file);
 
@@ -93,10 +92,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;
@@ -189,26 +191,7 @@ static void write_inventory(struct MapObj * player, FILE * file)
 static void write_map(FILE * file)
 {
     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);
-    struct MapObj * o;
-    struct MapObjDef * d;
-    char c;
-    uint8_t i;
-    for (i = 0; i < 2; i++)
-    {
-        for (o = world.map_objs; o != 0; o = o->next)
-        {
-            if ((   (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;
-            }
-        }
-    }
+    char * visible_map = build_visible_map();
     uint16_t x, y;
     for (y = 0; y < world.map.size.y; y++)
     {
@@ -218,6 +201,7 @@ static void write_map(FILE * file)
         }
         try_fputc('\n', file, f_name);
     }
+    free(visible_map);
 }