Add to TODO.

[plomrogue] / src / server / field_of_view.c

diff --git a/src/server/field_of_view.c b/src/server/field_of_view.c
index 4b1ac00194d6a9498b2e3a5a3a8bba818bb147cd..45f3108aafcb2a2f2be773d7e81d5f26aafdbd8f 100644 (file)
--- a/src/server/field_of_view.c
+++ b/src/server/field_of_view.c
@@ -374,7 +374,7 @@ static void update_map_memory(struct Thing * t_eye, uint32_t map_size)
     struct ThingInMemory * tm = t_eye->t_mem;
     struct ThingInMemory * tm_prev = NULL;
     struct ThingInMemory * tm_next = NULL;
-    for (; tm != NULL; tm = tm_next)
+    for (; tm; tm = tm_next)
     {
         tm_next = tm->next;
         if ('v' == t_eye->fov_map[tm->pos.y * world.map.length + tm->pos.x])
@@ -393,7 +393,7 @@ static void update_map_memory(struct Thing * t_eye, uint32_t map_size)
         tm_prev = tm;
     }
     struct Thing * t = world.things;
-    for (; t != NULL; t = t->next)
+    for (; t; t = t->next)
     {
         if (   !t->lifepoints
             && 'v' == t_eye->fov_map[t->pos.y * world.map.length + t->pos.x])
@@ -410,19 +410,19 @@ extern void build_fov_map(struct Thing * t)
     uint32_t map_size = world.map.length * world.map.length;
     t->fov_map = t->fov_map ? t->fov_map : try_malloc(map_size, __func__);
     memset(t->fov_map, 'v', map_size);
-    struct yx_uint8 test_pos = t->pos;
     struct shadow_angle * shadows = NULL;
+    struct yx_uint8 test_pos = t->pos;
     char * circle_dirs = "xswedc";
     uint16_t dist;
-    uint8_t first_round, circle_on_map;
-    for (first_round = 1, dist = 1, circle_on_map = 1; circle_on_map; dist++)
+    uint8_t circle_on_map;
+    for (dist = 1, circle_on_map = 1; circle_on_map; dist++)
     {
-        if (!first_round)
+        if (1 != dist)
         {
             mv_yx_in_dir_legal('c', &test_pos);
         }
         char dir = 'd';
-        uint8_t i_dir = first_round = circle_on_map = 0;
+        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++)
         {