X-Git-Url: https://plomlompom.com/repos/?p=plomrogue;a=blobdiff_plain;f=libplomrogue.c;h=9f872e1d406158f3a77920de025e6bd9309752c9;hp=9a4e69a7cdd2158374b16a77102a41b46b69798e;hb=HEAD;hpb=455db0213bfd97aff1a6309c9c53f6701c3fce84

diff --git a/libplomrogue.c b/libplomrogue.c
index 9a4e69a..9f872e1 100644
--- a/libplomrogue.c
+++ b/libplomrogue.c
@@ -340,7 +340,8 @@ static uint8_t shade_hex(uint32_t left_angle, uint32_t right_angle,
  */
 static uint8_t eval_position(uint16_t dist, uint16_t hex_i, char * fov_map,
                              struct yx_uint8 * test_pos,
-                             struct shadow_angle ** shadows)
+                             struct shadow_angle ** shadows,
+                             const char * symbols_obstacle)
 {
     int32_t left_angle_uncorrected =   ((CIRCLE / 12) / dist)
                                      - (hex_i * (CIRCLE / 6) / dist);
@@ -357,7 +358,7 @@ static uint8_t eval_position(uint16_t dist, uint16_t hex_i, char * fov_map,
     uint16_t pos_in_map = test_pos->y * maplength + test_pos->x;
     uint8_t all_shaded = shade_hex(left_angle, right_angle_1st, middle_angle,
                                    shadows, pos_in_map, fov_map);
-    if (!all_shaded && 'X' == worldmap[pos_in_map])
+    if (!all_shaded && NULL != strchr(symbols_obstacle, worldmap[pos_in_map]))
     {
         if (set_shadow(left_angle, right_angle_1st, shadows))
         {
@@ -378,8 +379,9 @@ static uint8_t eval_position(uint16_t dist, uint16_t hex_i, char * fov_map,
 /* Update field of view in "fovmap" of "worldmap_input" as seen from "y"/"x".
  * Return 1 on malloc error, else 0.
  */
-extern uint8_t build_fov_map(uint8_t y, uint8_t x,
-                             char * fovmap, char * worldmap_input)
+extern uint8_t build_fov_map(uint8_t y, uint8_t x, char * fovmap,
+                             char * worldmap_input,
+                             const char * symbols_obstacle)
 {
     worldmap = worldmap_input;
     struct shadow_angle * shadows = NULL;
@@ -408,7 +410,8 @@ extern uint8_t build_fov_map(uint8_t y, uint8_t x,
             }
             if (mv_yx_in_dir_legal(dir_char, &test_pos))
             {
-                if (eval_position(circle_i, hex_i, fovmap, &test_pos, &shadows))
+                if (eval_position(circle_i, hex_i, fovmap, &test_pos, &shadows,
+                                  symbols_obstacle))
                 {
                     return 1;
                 }
@@ -519,7 +522,8 @@ extern uint16_t get_neighbor_score(uint8_t i)
  * neighbor's score is at least two points lower than the current cell's score,
  * re-set it to 1 point higher than its lowest-scored neighbor. Repeat this
  * whole process until all cells have settled on their final score. Ignore cells
- * whose score is greater than UINT16_MAX - 1 (treat those as unreachable).
+ * whose score is greater than UINT16_MAX - 1 (treat those as unreachable). Also
+ * ignore cells whose score is smaller or equal the number of past iterations.
  * Return 1 on error, else 0.
  */
 extern uint8_t dijkstra_map()
@@ -539,7 +543,8 @@ extern uint8_t dijkstra_map()
         scores_still_changing = 0;
         for (pos = 0; pos < map_size; pos++)
         {
-            if (score_map[pos] <= max_score)
+            uint16_t score = score_map[pos];
+            if (score <= max_score && score > i_scans)
             {
                 get_neighbor_scores(pos, max_score, neighbors);
                 min_neighbor = max_score;
@@ -581,7 +586,7 @@ extern uint8_t zero_score_map_where_char_on_memdepthmap(char c,
 }
 
 extern void age_some_memdepthmap_on_nonfov_cells(char * memdepthmap,
-                                                     char * fovmap)
+                                                 char * fovmap)
 {
     uint32_t map_size = maplength * maplength;
     uint16_t pos;
@@ -597,3 +602,59 @@ extern void age_some_memdepthmap_on_nonfov_cells(char * memdepthmap,
         }
     }
 }
+
+extern uint8_t set_cells_passable_on_memmap_to_65534_on_scoremap(char * mem_map,
+                                                  const char * symbols_passable)
+{
+    if (!score_map)
+    {
+        return 1;
+    }
+    uint32_t map_size = maplength * maplength;
+    uint16_t pos;
+    for (pos = 0; pos < map_size; pos++)
+    {
+        if (NULL != strchr(symbols_passable, mem_map[pos]))
+        {
+            score_map[pos] = 65534;
+        }
+    }
+    return 0;
+}
+
+
+extern void update_mem_and_memdepthmap_via_fovmap(char * map, char * fovmap,
+                                                  char * memdepthmap,
+                                                  char * memmap)
+{
+    uint32_t map_size = maplength * maplength;
+    uint16_t pos;
+    for (pos = 0; pos < map_size; pos++)
+    {
+        if ('v' == fovmap[pos])
+        {
+            memdepthmap[pos] = '0';
+            memmap[pos] = map[pos];
+        }
+    }
+}
+
+/* USEFUL FOR DEBUGGING
+#include <stdio.h>
+extern void write_score_map()
+{
+    FILE *f = fopen("score_map", "a");
+
+    fprintf(f, "\n---------------------------------------------------------\n");
+    uint32_t y, x;
+    for (y = 0; y < maplength; y++)
+    {
+        for (x = 0; x < maplength; x++)
+        {
+            fprintf(f, "%2X", score_map[y * maplength + x] % 256);
+        }
+        fprintf(f, "\n");
+    }
+    fclose(f);
+}
+*/