Server: Decouple update_map_memory() and build_fov_map(), thus fix bugs.

[plomrogue] / src / server / field_of_view.c

diff --git a/src/server/field_of_view.c b/src/server/field_of_view.c
index 3d86402fe3c4f60aebc355e41c7e994271daf95a..7ab567833a1bd67eb3087c67e80e9fc92eb28c70 100644 (file)
--- a/src/server/field_of_view.c
+++ b/src/server/field_of_view.c
@@ -1,7 +1,13 @@
-/* src/server/field_of_view.c */
+/* src/server/field_of_view.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.
+ */
 
 #include "field_of_view.h"
-#include <stdint.h> /* uint8_t, uint16_t, uint32_t, int32_t */
+#include <stddef.h> /* NULL */
+#include <stdint.h> /* uint8_t, uint16_t, uint32_t, int32_t, UINT8_MAX */
 #include <stdlib.h> /* free() */
 #include <string.h> /* memset() */
 #include "../common/rexit.h" /* exit_trouble() */
@@ -9,7 +15,6 @@
 #include "../common/yx_uint8.h" /* yx_uint8 */
 #include "map.h" /* mv_yx_in_dir_legal() */
 #include "things.h" /* Thing, ThingInMemory, add_thing_to_memory_map() */
-#include "yx_uint8.h" /* mv_yx_in_dir_wrap(), */
 #include "world.h" /* world  */
 
 
@@ -70,11 +75,6 @@ static void eval_position(uint16_t dist, uint16_t hex_i, char * fov_map,
                           struct yx_uint8 * test_pos,
                           struct shadow_angle ** shadows);
 
-/* Update "t"'s .mem_map memory with what's in its current FOV, remove from its
- * .t_mem all memorized things in FOV and add inanimiate things in FOV to it.
- */
-static void update_map_memory(struct Thing * t, uint32_t map_size);
-
 
 
 static uint32_t correct_angle(int32_t angle)
@@ -262,15 +262,15 @@ static void eval_position(uint16_t dist, uint16_t hex_i, char * fov_map,
 
 
 
-static void update_map_memory(struct Thing * t_eye, uint32_t map_size)
+extern void update_map_memory(struct Thing * t_eye)
 {
     if (!t_eye->mem_map)
     {
-        t_eye->mem_map = try_malloc(map_size, __func__);
-        memset(t_eye->mem_map, ' ', map_size);
+        t_eye->mem_map = try_malloc(world.map.length*world.map.length,__func__);
+        memset(t_eye->mem_map, ' ', world.map.length * world.map.length);
     }
     uint32_t i;
-    for (i = 0; i < map_size; i++)
+    for (i = 0; i < (uint32_t) (world.map.length * world.map.length); i++)
     {
         if (' ' == t_eye->mem_map[i] && t_eye->fov_map[i] == 'v')
         {
@@ -318,34 +318,33 @@ extern void build_fov_map(struct Thing * t)
     memset(t->fov_map, 'v', map_size);
     struct shadow_angle * shadows = NULL;
     struct yx_uint8 test_pos = t->pos;
-    char * circle_dirs = "xswedc";
-    uint16_t dist;
-    uint8_t circle_on_map;
-    for (dist = 1, circle_on_map = 1; circle_on_map; dist++)
+    char * circledirs_string = "xswedc";
+    uint16_t circle_i;
+    uint8_t circle_is_on_map;
+    for (circle_i = 1, circle_is_on_map = 1; circle_is_on_map; circle_i++)
     {
-        if (1 != dist)
-        {
-            mv_yx_in_dir_legal('c', &test_pos);
-        }
-        char dir = 'd';
-        uint8_t i_dir = circle_on_map = 0;
-        uint16_t i_dist, hex_i;
-        for (hex_i = 0, i_dist = 1; hex_i < 6 * dist; i_dist++, hex_i++)
+        circle_is_on_map = 0;
+        if (1 < circle_i)                      /* All circles but the 1st are */
+        {                                      /* moved into starting from a  */
+            mv_yx_in_dir_legal('c', &test_pos);/* previous circle's last hex, */
+        }                                      /* i.e. from the upper left.   */
+        char dir_char = 'd'; /* Circle's 1st hex is entered by rightward move.*/
+        uint8_t dir_char_pos_in_circledirs_string = UINT8_MAX;
+        uint16_t dist_i, hex_i;
+        for (hex_i=0, dist_i=circle_i; hex_i < 6 * circle_i; dist_i++, hex_i++)
         {
-            if (mv_yx_in_dir_legal(dir, &test_pos))
+            if (circle_i < dist_i)
             {
-                eval_position(dist, hex_i, t->fov_map, &test_pos, &shadows);
-                circle_on_map = 1;
+                dist_i = 1;
+                dir_char=circledirs_string[++dir_char_pos_in_circledirs_string];
             }
-            dir = circle_dirs[i_dir];
-            if (dist == i_dist)
+            if (mv_yx_in_dir_legal(dir_char, &test_pos))
             {
-                i_dist = 0;
-                i_dir++;
+                eval_position(circle_i, hex_i, t->fov_map, &test_pos, &shadows);
+                circle_is_on_map = 1;
             }
         }
     }
-    mv_yx_in_dir_wrap(0, NULL, 1);
+    mv_yx_in_dir_legal(0, NULL);
     free_angles(shadows);
-    update_map_memory(t, map_size);
 }