remove best move evaluation (only avaliable for pet)

diff --git a/checkers.c b/checkers.c
index 8035160ad4d1c8635f301ccf3bcc50872a6bec58..c5032b39bc0d7d24083521415aa06789722f2f7f 100644 (file)
--- a/checkers.c
+++ b/checkers.c
@@ -57,13 +57,13 @@ int usage (int ret)
     return ret;
 }
 
-int petturn (board_t **board, cache_t *cache, int *xcursor, int *ycursor, int jump, int direction)
+int petturn (board_t **board, cache_t *cache, int *xcursor, int *ycursor, int direction)
 {
     int player = getid (*board, *xcursor, *ycursor);
 
     int mode = 1;
     if (ispet (*board, *xcursor, *ycursor, player, 0, -1)) {
-        if ((jump) && (testjump (*board, *xcursor, *ycursor, direction))) {
+        if (testjump (*board, *xcursor, *ycursor, direction)) {
             pushcache (cache, *board, *xcursor, *ycursor, -1);
             *board = copyboard (*board);
             dopetjump (*board, xcursor, ycursor, direction);
@@ -258,27 +258,24 @@ int main (int argc, char *argv[])
     while (!stop) {
         char msg[128] = {0};
         char *ptr = NULL;
-        int nbmaxjumps = 0;
-        int jump = 0;
 
         boardwindow (board);
         if (1) { /* not end of game */
             sprintf (msg, "Player %s: ", (player == 0) ? "One": "Two");
             switch (mode) {
             case 0:
-                jump = cursorwindow (board, xcursor, ycursor, queen, 0);
-                nbmaxjumps = globalmaxjumps (board, player);
-                sprintf (msg + strlen (msg), "Begin turn (%d)", nbmaxjumps);
+                cursorwindow (board, xcursor, ycursor, queen, 0);
+                sprintf (msg + strlen (msg), "Begin turn");
                 break;
             case 1:
-                jump = cursorwindow (board, xcursor, ycursor, queen, 1);
-                sprintf (msg + strlen (msg), "Choose next (%d)", nbmaxjumps);
+                cursorwindow (board, xcursor, ycursor, queen, 1);
+                sprintf (msg + strlen (msg), "Choose next");
                 break;
             case 2:
                 sprintf (msg + strlen (msg), "Validate turn");
                 break;
             case 3:
-                jump = cursorwindow (board, xcursor, ycursor, queen, 1);
+                cursorwindow (board, xcursor, ycursor, queen, 1);
                 sprintf (msg + strlen (msg), "Continue or validate turn");
                 break;
             }
@@ -328,7 +325,7 @@ int main (int argc, char *argv[])
                 domove (board, &xcursor, &ycursor, 0);
                 break;
             case 1:
-                mode = petturn (&board, cache, &xcursor, &ycursor, jump, 0);
+                mode = petturn (&board, cache, &xcursor, &ycursor, 0);
                 break;
             case 3:
                 queen = queenturn (&board, cache, &xcursor, &ycursor, queen, 0);
@@ -342,7 +339,7 @@ int main (int argc, char *argv[])
                 domove (board, &xcursor, &ycursor, 1);
                 break;
             case 1:
-                mode = petturn (&board, cache, &xcursor, &ycursor, jump, 1);
+                mode = petturn (&board, cache, &xcursor, &ycursor, 1);
                 break;
             case 3:
                 queen = queenturn (&board, cache, &xcursor, &ycursor, queen, 1);
@@ -356,7 +353,7 @@ int main (int argc, char *argv[])
                 domove (board, &xcursor, &ycursor, 2);
                 break;
             case 1:
-                mode = petturn (&board, cache, &xcursor, &ycursor, jump, 2);
+                mode = petturn (&board, cache, &xcursor, &ycursor, 2);
                 break;
             case 3:
                 queen = queenturn (&board, cache, &xcursor, &ycursor, queen, 2);
@@ -370,7 +367,7 @@ int main (int argc, char *argv[])
                 domove (board, &xcursor, &ycursor, 3);
                 break;
             case 1:
-                mode = petturn (&board, cache, &xcursor, &ycursor, jump, 3);
+                mode = petturn (&board, cache, &xcursor, &ycursor, 3);
                 break;
             case 3:
                 queen = queenturn (&board, cache, &xcursor, &ycursor, queen, 3);

diff --git a/display.c b/display.c
index 8a28544f88686dd26c8200a377d8c4c6bbdc12f7..5150caaaf2f9a8f42dda3c22a757b61d0d569738 100644 (file)
--- a/display.c
+++ b/display.c
@@ -357,7 +357,7 @@ void boardwindow (board_t *board)
     }
 }
 
-int cursorwindow (board_t *board, int x, int y, int queen, int mode)
+void cursorwindow (board_t *board, int x, int y, int queen, int mode)
 {
     int jump = 0;
     char id = getvalue (board, x, y);
@@ -522,7 +522,6 @@ int cursorwindow (board_t *board, int x, int y, int queen, int mode)
             break;
         }
     }
-    return jump;
 }
 
 char *savewindow (int length, int xoffset, int yoffset)

diff --git a/display.h b/display.h
index a298325e38738ffc4231ab5e05df9774edaa7415..52c3c251ea5ec928d65d629f856bcb09e44204f9 100644 (file)
--- a/display.h
+++ b/display.h
@@ -10,7 +10,7 @@ int helpwindow (char *msg, int xoffset, int yoffset);
 
 void boardwindow (board_t *board);
 
-int cursorwindow (board_t *board, int x, int y, int queen, int mode);
+void cursorwindow (board_t *board, int x, int y, int queen, int mode);
 
 char *savewindow (int length, int xoffset, int yoffset);
 

diff --git a/function.c b/function.c
index 96ed09eac9af39afefc44cdebac93ac3d56247bc..429a036cdb5dfeb7d8e026a2f77bc4028cb8fcd0 100644 (file)
--- a/function.c
+++ b/function.c
@@ -497,19 +497,6 @@ int evalmaxjumps (board_t *board, int x, int y, int id)
     return maxjumps;
 }
 
-int globalmaxjumps (board_t *board, int id)
-{
-    int i, j;
-    int maxjumps = 0;
-    for (i = 0; i < board->width; i++) {
-        for (j = 0; j < board->height; j++) {
-            int nb = evalmaxjumps (board, i, j, id);
-            maxjumps = max (nb, maxjumps);
-        }
-    }
-    return maxjumps;
-}
-
 int testqueenmove (board_t *board, int xcursor, int ycursor, int queen, int mode)
 {
     int ret = 0;

diff --git a/function.h b/function.h
index 082ad28a0f7a4990a0367dbd1e1f6b8c3aab7dbb..5d7f40b9dd76d1a882e39613bb1e92c109366129 100644 (file)
--- a/function.h
+++ b/function.h
@@ -67,8 +67,6 @@ int testalljumps (board_t *board, int x, int y);
 
 int evalmaxjumps (board_t *board, int x, int y, int id);
 
-int globalmaxjumps (board_t *board, int id);
-
 int testqueenmove (board_t *board, int xcursor, int ycursor, int queen, int mode);
 
 int testqueenjump (board_t *board, int xcursor, int ycursor, int mode);