Add (crude) field of view to player's view of map.

[plomrogue] / src / server / io.c

diff --git a/src/server/io.c b/src/server/io.c
index f318ca6c15d8716c5b3eb6394a6216bf0996973c..81251c1e4ff34612d7e1f9ecf6a964d23f8373bf 100644 (file)
--- a/src/server/io.c
+++ b/src/server/io.c
@@ -1,25 +1,22 @@
 /* src/server/io.c */
 
+#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 <stdio.h> /* defines EOF, FILE, sprintf(), ungetc() */
-#include <stdlib.h> /* free(), atoi() */
+#include <stdio.h> /* defines EOF, FILE, sprintf() */
+#include <stdlib.h> /* free() */
 #include <string.h> /* strlen(), memcpy() */
 #include <sys/types.h> /* time_t */
-#include <time.h> /* time() */
-#include "../common/err_try_fgets.h" /* err_try_fgets(), err_line(),
-                                      * reset_err_try_fgets_counter()
-                                      */
+#include <time.h> /* time(), nanosleep() */
 #include "../common/readwrite.h" /* try_fopen(), try_fclose_unlink_rename(),
-                                  * try_fwrite(), try_fputc(), try_fgetc(),
-                                  * try_fclose()
+                                  * try_fwrite(), try_fputc(), try_fgetc()
                                   */
-#include "../common/rexit.h" /* exit_trouble() */
 #include "../common/try_malloc.h" /* try_malloc() */
-#include "cleanup.h" /* set_cleanup_flag(), enum cleanup_flag */
+#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  */
 
@@ -32,8 +29,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();
 
@@ -48,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);
 
@@ -95,9 +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)))
     {
+        nanosleep(&dur, NULL);
         if (time(0) > now + wait_seconds)
         {
             return;
@@ -190,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++)
     {
@@ -219,49 +201,7 @@ static void write_map(FILE * file)
         }
         try_fputc('\n', file, f_name);
     }
-}
-
-
-
-extern void read_config_file(char * path, enum cleanup_flag cleanup,
-                             void (* read) (char *, uint32_t, char *,
-                                            struct EntrySkeleton *, FILE *),
-                             size_t size, struct EntrySkeleton ** entry_start)
-{
-    char * f_name = "init_map_object_defs()";
-    char * context_prefix = "Failed reading config file: ";
-    char context[strlen(context_prefix) + strlen(path) + 1];
-    sprintf(context, "%s%s", context_prefix, path);
-    char * err_uniq = "Declaration of ID already used.";
-    FILE * file = try_fopen(path, "r", f_name);
-    uint32_t linemax = textfile_width(file);
-    char line[linemax + 1];
-    reset_err_try_fgets_counter();
-    struct EntrySkeleton ** entry_ptr_ptr = entry_start;
-    while (1)
-    {
-        int test_for_end = try_fgetc(file, f_name);
-        if (EOF == test_for_end || '\n' == test_for_end)
-        {
-            break;
-        }
-        exit_trouble(EOF == ungetc(test_for_end, file), f_name, "ungetc()");
-        err_try_fgets(line, linemax, file, context, "nfi8");
-        struct EntrySkeleton * entry = try_malloc(size, f_name);
-        entry->id = atoi(line);
-        struct EntrySkeleton * entry_test = * entry_start;
-        for (; NULL != entry_test; entry_test = entry_test->next)
-        {
-            err_line(entry->id == entry_test->id, line, context, err_uniq);
-        }
-        read(line, linemax, context, entry, file);
-        entry->next = NULL;
-        * entry_ptr_ptr = entry;
-        entry_ptr_ptr = &entry->next;
-        err_try_fgets(line, linemax, file, context, "d");
-    }
-    try_fclose(file, f_name);
-    set_cleanup_flag(cleanup);
+    free(visible_map);
 }