diff options
Diffstat (limited to 'src/maze.c')
| -rw-r--r-- | src/maze.c | 50 |
1 files changed, 31 insertions, 19 deletions
@@ -1,7 +1,6 @@ #include "maze.h" #include "grid.h" #include "position.h" -#include <stdint.h> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -11,42 +10,43 @@ int is_pos_empty(Grid grid, Position pos) return strcmp(grid_get(grid, pos), " ") != 0; } -void add_neighbour(Position neighbours[], uint8_t *neighbour_cnt, Position neighbour_pos) +void add_neighbour(Position neighbours[3], unsigned int *neighbour_cnt, + Position neighbour_pos) { neighbours[*neighbour_cnt] = neighbour_pos; (*neighbour_cnt)++; } -void get_neighbours(Grid grid, Position pos, Position neighbours[], - uint8_t *neighbour_cnt) +void get_neighbours(Grid grid, Position pos, Position neighbours[3], + unsigned int *neighbour_cnt) { - if (pos.y != 1) + if (pos.y != 1U) { - Position pos_down = position_create(pos.x, pos.y - 2); + Position pos_down = position_create(pos.x, pos.y - 2U); if (is_pos_empty(grid, pos_down)) add_neighbour(neighbours, neighbour_cnt, pos_down); } - if (pos.y != grid.dimens.height - 2) + if (pos.y != grid.dimens.height - 2U) { - Position pos_up = position_create(pos.x, pos.y + 2); + Position pos_up = position_create(pos.x, pos.y + 2U); if (is_pos_empty(grid, pos_up)) add_neighbour(neighbours, neighbour_cnt, pos_up); } - if (pos.x != 1) + if (pos.x != 1U) { - Position pos_left = position_create(pos.x - 2, pos.y); + Position pos_left = position_create(pos.x - 2U, pos.y); if (is_pos_empty(grid, pos_left)) add_neighbour(neighbours, neighbour_cnt, pos_left); } - if (pos.x != grid.dimens.width - 2) + if (pos.x != grid.dimens.width - 2U) { - Position pos_right = position_create(pos.x + 2, pos.y); + Position pos_right = position_create(pos.x + 2U, pos.y); if (is_pos_empty(grid, pos_right)) add_neighbour(neighbours, neighbour_cnt, pos_right); @@ -55,12 +55,12 @@ void get_neighbours(Grid grid, Position pos, Position neighbours[], unsigned int get_maze_size(Grid grid) { - return ((grid.dimens.width - 1) / 2) * ((grid.dimens.height - 1) / 2); + return ((grid.dimens.width - 1U) / 2U) * ((grid.dimens.height - 1U) / 2U); } int is_whole_maze_visited(Grid grid, unsigned int visited_pos_cnt) { - return visited_pos_cnt == get_maze_size(grid) - 1; + return visited_pos_cnt == get_maze_size(grid) - 1U; } void grid_to_maze(Grid grid, Position start_pos) @@ -69,7 +69,7 @@ void grid_to_maze(Grid grid, Position start_pos) pos_stack_push(path, start_pos); - unsigned int visited_pos_cnt = 0; + unsigned int visited_pos_cnt = 0U; while (1) { Position pos = pos_stack_peek(path); @@ -77,11 +77,11 @@ void grid_to_maze(Grid grid, Position start_pos) grid_set(grid, pos, " "); Position neighbours[3]; - uint8_t neighbour_cnt = 0; + unsigned int neighbour_cnt = 0U; get_neighbours(grid, pos, neighbours, &neighbour_cnt); - if (neighbour_cnt == 0) + if (neighbour_cnt == 0U) { if (is_whole_maze_visited(grid, visited_pos_cnt)) break; @@ -98,14 +98,26 @@ void grid_to_maze(Grid grid, Position start_pos) Position between_pos = position_create(pos.x, pos.y); if (next_pos.y != pos.y) - between_pos.y += next_pos.y > pos.y ? 1 : -1; + { + if (next_pos.y > pos.y) + between_pos.y += 1U; + else + between_pos.y -= 1U; + } if (next_pos.x != pos.x) - between_pos.x += next_pos.x > pos.x ? 1 : -1; + { + if (next_pos.x > pos.x) + between_pos.x += 1U; + else + between_pos.x -= 1U; + } grid_set(grid, between_pos, " "); pos_stack_push(path, next_pos); + + // grid_print(grid); } pos_stack_destroy(path); |