X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=libplomrogue.c;h=d0b15a10bc5d260f4fcf1fc75af6551863e01157;hb=a50806df8116a81729220bd79870639b18da9d8c;hp=384c81db0094fd512a5e2eb8b6e7407cea2926c5;hpb=94504421e041769058facdea5dbf310d3561c3aa;p=plomrogue
diff --git a/libplomrogue.c b/libplomrogue.c
index 384c81d..d0b15a1 100644
--- a/libplomrogue.c
+++ b/libplomrogue.c
@@ -1,3 +1,4 @@
+#include /* pow() */
#include /* NULL */
#include /* ?(u)int(8|16|32)_t, ?(U)INT8_(MIN|MAX) */
#include /* free, malloc */
@@ -448,20 +449,6 @@ extern uint8_t set_map_score(uint16_t pos, uint16_t score)
return 1;
}
score_map[pos] = score;
-/*
- uint32_t mup_size = maplength * maplength;
- uint32_t pus;
- FILE * file = fopen("test_set", "w");
- for (pus = 0; pus < mup_size; pus++)
- {
- fprintf(file, "%d ", score_map[pus]);
- if (0 == pus % maplength)
- {
- fprintf(file, "\n");
- }
- }
- fclose(file);
-*/
return 0;
}
@@ -532,7 +519,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()
@@ -552,7 +540,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;
@@ -573,3 +562,58 @@ extern uint8_t dijkstra_map()
}
return 0;
}
+
+extern uint8_t zero_score_map_where_char_on_memdepthmap(char c,
+ char * memdepthmap)
+{
+ if (!score_map)
+ {
+ return 1;
+ }
+ uint32_t map_size = maplength * maplength;
+ uint16_t pos;
+ for (pos = 0; pos < map_size; pos++)
+ {
+ if (c == memdepthmap[pos])
+ {
+ score_map[pos] = 0;
+ }
+ }
+ return 0;
+}
+
+extern void age_some_memdepthmap_on_nonfov_cells(char * memdepthmap,
+ char * fovmap)
+{
+ uint32_t map_size = maplength * maplength;
+ uint16_t pos;
+ for (pos = 0; pos < map_size; pos++)
+ {
+ if ('v' != fovmap[pos])
+ {
+ char c = memdepthmap[pos];
+ if( '0' <= c && '9' > c && !(rrand() % (uint16_t) pow(2, c - 48)))
+ {
+ memdepthmap[pos]++;
+ }
+ }
+ }
+}
+
+extern uint8_t set_cells_passable_on_memmap_to_65534_on_scoremap(char * mem_map)
+{
+ if (!score_map)
+ {
+ return 1;
+ }
+ uint32_t map_size = maplength * maplength;
+ uint16_t pos;
+ for (pos = 0; pos < map_size; pos++)
+ {
+ if ('.' == mem_map[pos])
+ {
+ score_map[pos] = 65534;
+ }
+ }
+ return 0;
+}