Fix some indentation and typo issues

Signed-off-by: Jérôme Benoit <jerome.benoit@piment-noir.org>

diff --git a/lib/othello.c b/lib/othello.c
index e1290b4f3f39e6455e8711e784404827552c77aa..12470ee23594486a59a00e6195fa93be463371ac 100644 (file)
--- a/lib/othello.c
+++ b/lib/othello.c
@@ -181,10 +181,10 @@ unsigned int eval_winner(unsigned int nb_white, unsigned int nb_black) {
 }
 
 static unsigned int reverse_one_direction(int y, int x, int direction, unsigned int current_player, unsigned int pawn_array[board_size][board_size]) {
-    unsigned int nb_pawns_reserved = 0;
+    unsigned int nb_pawns_reversed = 0;
     int moving_y = y, moving_x = x;
 
-    /* count for pawn to reverse in the chosen direction */
+    /* count for pawns to reverse in the chosen direction */
     direction_to_coordinates(direction, &moving_y, &moving_x);
     while (true) {
         if (!is_valid_coordinates(moving_y, moving_x) || is_box_type(moving_y, moving_x, pawn_array, empty)) {
@@ -193,12 +193,12 @@ static unsigned int reverse_one_direction(int y, int x, int direction, unsigned
         if (is_box_type(moving_y, moving_x, pawn_array, current_player)) {
             break;
         }
-        nb_pawns_reserved++;
+        nb_pawns_reversed++;
         direction_to_coordinates(direction, &moving_y, &moving_x);
     }
 
-    /* now reverse the needed panws */
-    if (nb_pawns_reserved > 0) {
+    /* now reverse the needed pawns */
+    if (nb_pawns_reversed > 0) {
         moving_y = y, moving_x = x;
         direction_to_coordinates(direction, &moving_y, &moving_x);
         while (!is_box_type(moving_y, moving_x, pawn_array, current_player)) {
@@ -206,25 +206,25 @@ static unsigned int reverse_one_direction(int y, int x, int direction, unsigned
             direction_to_coordinates(direction, &moving_y, &moving_x);
         }
     }
-    return nb_pawns_reserved;
+    return nb_pawns_reversed;
 }
 
 /* play the shot if legal and flip or reverse the necessary pawns */
 unsigned int valid_shot(int y, int x, unsigned int current_player, unsigned int pawn_array[board_size][board_size]) {
-    unsigned int nb_pawns_reserved = 0;
+    unsigned int nb_pawns_reversed = 0;
 
     if (!is_valid_coordinates(y, x) || !is_box_type(y, x, pawn_array, empty)) {
         return 0;
     }
 
     for (unsigned int direction = north; direction <= north_west; direction++) {
-        nb_pawns_reserved += reverse_one_direction(y, x, direction, current_player, pawn_array);
+        nb_pawns_reversed += reverse_one_direction(y, x, direction, current_player, pawn_array);
     }
     
-    if (nb_pawns_reserved == 0) {
+    if (nb_pawns_reversed == 0) {
         return 0;
     }
 
     set_pawn(y, x, current_player, pawn_array);
-    return nb_pawns_reserved;
+    return nb_pawns_reversed;
 }

diff --git a/lib/othello.h b/lib/othello.h
index dc6784ea58307edfa57ad118eeab1cad9a61b997..9800676693bd58f59919d56269428f3ed00c30ad 100644 (file)
--- a/lib/othello.h
+++ b/lib/othello.h
@@ -45,6 +45,6 @@ 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);
 
-unsigned int valid_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]);
 
 #endif /* OTHELLO_H */