X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fserver%2Ffield_of_view.c;h=34bfa138eb06c1b5f641f0ff386d78d0f7e9d3d6;hb=c560e7b4c403cf75b5a7ebd7cc4818ade1ae845d;hp=b653e3a373ee41b2af759e5476baf60fad7b4584;hpb=a10c971ab3d9f9850e1ce1efbcd3c93c1738f138;p=plomrogue

diff --git a/src/server/field_of_view.c b/src/server/field_of_view.c
index b653e3a..34bfa13 100644
--- 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() */
@@ -323,26 +329,25 @@ extern void build_fov_map(struct Thing * t)
     for (circle_i = 1, circle_is_on_map = 1; circle_is_on_map; circle_i++)
     {
         circle_is_on_map = 0;
-        if (1 != circle_i)
-        {
-            mv_yx_in_dir_legal('c', &test_pos);
-        }
-        char dir_char = 'd';
-        uint8_t dir_char_pos_in_circledirs_string = 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 = 1; hex_i < 6 * circle_i; dist_i++, hex_i++)
+        for (hex_i=0, dist_i=circle_i; hex_i < 6 * circle_i; dist_i++, hex_i++)
         {
+            if (circle_i < dist_i)
+            {
+                dist_i = 1;
+                dir_char=circledirs_string[++dir_char_pos_in_circledirs_string];
+            }
             if (mv_yx_in_dir_legal(dir_char, &test_pos))
             {
                 eval_position(circle_i, hex_i, t->fov_map, &test_pos, &shadows);
                 circle_is_on_map = 1;
             }
-            dir_char = circledirs_string[dir_char_pos_in_circledirs_string];
-            if (circle_i == dist_i)
-            {
-                dist_i = 0;
-                dir_char_pos_in_circledirs_string++;
-            }
         }
     }
     mv_yx_in_dir_legal(0, NULL);