From 3243371edb8b286cf832c512e63f302dad6e1de2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=B4me=20Benoit?= Date: Wed, 23 Aug 2017 21:28:50 +0200 Subject: [PATCH] Code cleanup on the shot validation path MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérôme Benoit --- lib/othello.c | 4 ++-- lib/othello.h | 1 + src/main.c | 8 +++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/lib/othello.c b/lib/othello.c index 1bc32e2..857625a 100644 --- a/lib/othello.c +++ b/lib/othello.c @@ -218,8 +218,8 @@ static unsigned int reverse_one_direction(int y, int x, int direction, unsigned return nb_pawns_reversed; } -/* loop optimized version of valid_shot changing nothing to the pawns 2D array */ -static bool is_legal_shot(int y, int x, unsigned int current_player, unsigned int pawn_array[board_size][board_size]) { +/* loop optimized version of valid_shot function changing nothing to the pawns 2D array */ +bool is_legal_shot(int y, int x, unsigned int current_player, unsigned int pawn_array[board_size][board_size]) { unsigned int nb_pawns_reversed = 0; if (!is_valid_coordinates(y, x) || !is_box_type(y, x, pawn_array, empty)) { diff --git a/lib/othello.h b/lib/othello.h index 7146617..9eb1c8c 100644 --- a/lib/othello.h +++ b/lib/othello.h @@ -45,6 +45,7 @@ bool is_board_full(unsigned int pawn_array[board_size][board_size]); unsigned int count_pawns_type(unsigned int pawn_array[board_size][board_size], unsigned int type); +bool is_legal_shot(int y, int x, unsigned int current_player, unsigned int pawn_array[board_size][board_size]); unsigned int valid_shot(int y, int x, unsigned int current_player, unsigned int pawn_array[board_size][board_size]); void build_playable_shots_list(unsigned int current_player, struct shots_list_s* shots_list, unsigned int pawn_array[board_size][board_size]); diff --git a/src/main.c b/src/main.c index a86a7ef..3ed7991 100644 --- a/src/main.c +++ b/src/main.c @@ -79,7 +79,6 @@ int main() { build_playable_shots_list(player, &playable_shots, pawns); print_shots_list(board_center_y, board_center_x, &playable_shots); - free_shots_list(&playable_shots); display_array(1, 1, pawns); @@ -93,8 +92,9 @@ int main() { const char* prompt_msg = "Prochain pion ? (ligne colonne - chiffre lettre):"; int prmt_rt = prompt_values(stdscr, center_y + 26/2 + 1, (center_x - strlen(prompt_msg)/2), prompt_msg, &y, &x_char); int x = map_col_letter_to_index(x_char); - nb_pawns_reversed = valid_shot(y, x, player, pawns); - if (nb_pawns_reversed > 0 && prmt_rt == 1) { + /* TODO: a comparaison to the linked list of playable shots is better */ + if (is_legal_shot(y, x, player, pawns) && prmt_rt == 1) { + nb_pawns_reversed = valid_shot(y, x, player, pawns); input_ok = true; clear(); } else { @@ -102,6 +102,8 @@ int main() { } } while (!input_ok); + free_shots_list(&playable_shots); + round++; /* increment the round count */ /* here are all the end of the game conditions */ -- 2.34.1