-#define N_DIRS 8
+#define N_DIRS 6
-/* Write into "neighbors" scores of the eight immediate 2D neighbors of the
- * "score_map" cell at "pos_i" (array index), as found in the directions north,
- * north-east, east etc. (clockwise order). "max_score" is used for illegal
- * neighborhoods (i.e. if the direction would lead beyond the map's border).
+/* Write into "neighbors" scores of the N_DIRS immediate neighbors of the
+ * "score_map" cell at "pos_i" (array index), as found in the directions
+ * north-east, east, south-east etc. (clockwise order). Use "max_score" for
+ * illegal neighborhoods (i.e. if direction would lead beyond the map's border).
*/
-static void get_neighbor_scores(uint32_t * score_map, uint16_t pos_i,
- uint32_t max_score, uint32_t * neighbors);
+static void get_neighbor_scores(uint16_t * score_map, uint16_t pos_i,
+ uint16_t max_score, uint16_t * neighbors);
-/* Iterate over scored cells in "score_map" of world.map's 2D geometry. Compare
+/* Iterate over scored cells in "score_map" of world.map's geometry. Compare
* each cell's score against the score of its immediate neighbors in N_DIRS
* directions. If it's neighbors are low enough that the result would be lower
- * than the current value, re-set it to world.map.dist_orthogonal points higher
- * than its lowest-scored orthogonal neighbor or world.map.dist_diagonal points
- * higher than its lowest-scored diagonal neighbor (whatever would result in a
- * lower value). Repeat this whole process until all cells have settled on their
+ * than the current value, 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 position in "score_map" fits cells of
* unreachable terrain in world.map.cells. Expect "max_score" to be the maximum
* score for cells, marking them as unreachable.
*/
-static void dijkstra_map(uint32_t * score_map, uint32_t max_score);
+static void dijkstra_map(uint16_t * score_map, uint16_t max_score);
/* Return numpad char of direction ("8", "6", "2", "4" etc.) of enemy with the
* shortest path to "mo_origin". If no enemy is around, return 0.
-static void get_neighbor_scores(uint32_t * score_map, uint16_t pos_i,
- uint32_t max_score, uint32_t * neighbors)
+static void get_neighbor_scores(uint16_t * score_map, uint16_t pos_i,
+ uint16_t max_score, uint16_t * neighbors)
{
uint32_t map_size = world.map.size.y * world.map.size.x;
uint8_t i_dir;
for (i_dir = 0; i_dir < N_DIRS; neighbors[i_dir] = max_score, i_dir++);
- uint8_t open_north = pos_i >= world.map.size.x;
- uint8_t open_east = pos_i + 1 % world.map.size.x;
- uint8_t open_south = pos_i + world.map.size.x < map_size;
- uint8_t open_west = pos_i % world.map.size.x;
- if (open_north)
+ uint8_t open_north = pos_i >= world.map.size.x;
+ uint8_t open_east = pos_i + 1 % world.map.size.x;
+ uint8_t open_south = pos_i + world.map.size.x < map_size;
+ uint8_t open_west = pos_i % world.map.size.x;
+ uint8_t is_indented = (pos_i / world.map.size.x) % 2;
+ uint8_t open_diag_west = is_indented || open_west;
+ uint8_t open_diag_east = !is_indented || open_east;
+ if (open_north && open_diag_east)
{
- neighbors[0] = score_map[pos_i - world.map.size.x];
- }
- if (open_north && open_east)
- {
- neighbors[1] = score_map[pos_i - world.map.size.x + 1];
+ neighbors[0] = score_map[pos_i - world.map.size.x + is_indented];
}
if (open_east)
{
- neighbors[2] = score_map[pos_i + 1];
+ neighbors[1] = score_map[pos_i + 1];
}
- if (open_east && open_south)
+ if (open_south && open_diag_east)
{
- neighbors[3] = score_map[pos_i + 1 + world.map.size.x];
+ neighbors[2] = score_map[pos_i + world.map.size.x + is_indented];
}
- if (open_south)
+ if (open_south && open_diag_west)
{
- neighbors[4] = score_map[pos_i + world.map.size.x];
- }
- if (open_south && open_west)
- {
- neighbors[5] = score_map[pos_i + world.map.size.x - 1];
+ neighbors[3] = score_map[pos_i + world.map.size.x - !is_indented];
}
if (open_west)
{
- neighbors[6] = score_map[pos_i - 1];
+ neighbors[4] = score_map[pos_i - 1];
}
- if (open_west && open_north)
+ if (open_north && open_diag_west)
{
- neighbors[7] = score_map[pos_i - 1 - world.map.size.x];
+ neighbors[5] = score_map[pos_i - world.map.size.x - !is_indented];
}
}
-static void dijkstra_map(uint32_t * score_map, uint32_t max_score)
+static void dijkstra_map(uint16_t * score_map, uint16_t max_score)
{
- uint32_t i_scans, neighbors[N_DIRS], min_neighbor_o, min_neighbor_d;
uint32_t map_size = world.map.size.y * world.map.size.x;
- uint16_t pos;
+ uint16_t pos, i_scans, neighbors[N_DIRS], min_neighbor;
uint8_t scores_still_changing = 1;
uint8_t i_dirs;
for (i_scans = 0; scores_still_changing; i_scans++)
if ('.' == world.map.cells[pos])
{
get_neighbor_scores(score_map, pos, max_score, neighbors);
- min_neighbor_d = max_score;
- min_neighbor_o = max_score;
+ min_neighbor = max_score;
for (i_dirs = 0; i_dirs < N_DIRS; i_dirs++)
{
- if (!(i_dirs % 2) && min_neighbor_o > neighbors[i_dirs])
+ if (min_neighbor > neighbors[i_dirs])
{
- min_neighbor_o = neighbors[i_dirs];
+ min_neighbor = neighbors[i_dirs];
}
- else if (i_dirs % 2 && min_neighbor_d > neighbors[i_dirs])
- {
- min_neighbor_d = neighbors[i_dirs];
- }
- }
- if (score_map[pos] > min_neighbor_o + world.map.dist_orthogonal)
- {
- score_map[pos] = min_neighbor_o + world.map.dist_orthogonal;
- scores_still_changing = 1;
}
- if (score_map[pos] > min_neighbor_d + world.map.dist_diagonal)
+ if (score_map[pos] > min_neighbor + 1)
{
- score_map[pos] = min_neighbor_d + world.map.dist_diagonal;
+ score_map[pos] = min_neighbor + 1;
scores_still_changing = 1;
}
}
* (Actors' own cells start with a distance of 0 towards themselves.)
*/
uint32_t map_size = world.map.size.y * world.map.size.x;
- uint32_t max_score = UINT32_MAX - (world.map.dist_diagonal + 1);
- uint32_t * score_map = try_malloc(map_size * sizeof(uint32_t), f_name);
+ uint16_t max_score = UINT16_MAX;
+ uint16_t * score_map = try_malloc(map_size * sizeof(uint16_t), f_name);
uint32_t i;
for (i = 0; i < map_size; i++)
{
dijkstra_map(score_map, max_score);
/* Return direction of "mo_origin"'s lowest-scored neighbor cell. */
- uint32_t neighbors[N_DIRS];
+ uint16_t neighbors[N_DIRS];
uint16_t pos_i = (mo_origin->pos.y * world.map.size.x) + mo_origin->pos.x;
get_neighbor_scores(score_map, pos_i, max_score, neighbors);
free(score_map);
char dir_to_nearest_enemy = 0;
- uint32_t min_neighbor = max_score;
- char * dirs = "89632147"; /* get_neighbor_scores()'s clockwise dir order.*/
+ uint16_t min_neighbor = max_score;
+ char * dirs = "edcxsw"; /* get_neighbor_scores()'s clockwise dir order.*/
for (i = 0; i < N_DIRS; i++)
{
if (min_neighbor > neighbors[i])
projects / plomrogue / blobdiff