ncurses 6.1 - patch 20191214

[ncurses.git] / test / knight.c

diff --git a/test/knight.c b/test/knight.c
index 0d6675e5ba1689ad22ee843b7bbb2d8fec11c1a1..dc04944acd73a593213d977d2aa995a71f2dc67c 100644 (file)
--- a/test/knight.c
+++ b/test/knight.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2017,2018 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2018,2019 Free Software Foundation, Inc.              *

  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *


@@ -33,7 +33,7 @@
  * Eric S. Raymond <esr@snark.thyrsus.com> July 22 1995.  Mouse support
  * added September 20th 1995.
  *
  * Eric S. Raymond <esr@snark.thyrsus.com> July 22 1995.  Mouse support
  * added September 20th 1995.
  *

- * $Id: knight.c,v 1.44 2018/05/12 13:23:24 tom Exp $
+ * $Id: knight.c,v 1.46 2019/08/24 22:40:52 tom Exp $

  */
 
 #include <test.priv.h>
  */
 
 #include <test.priv.h>


@@ -75,7 +75,9 @@ static WINDOW *boardwin;      /* the board window */
 static WINDOW *helpwin;                /* the help window */
 static WINDOW *msgwin;         /* the message window */
 
 static WINDOW *helpwin;                /* the help window */
 static WINDOW *msgwin;         /* the message window */
 

+#if HAVE_USE_DEFAULT_COLORS

 static bool d_option;
 static bool d_option;

+#endif

 
 static chtype minus = '-';     /* possible-move character */
 static chtype oldch;
 
 static chtype minus = '-';     /* possible-move character */
 static chtype oldch;


@@ -326,21 +328,20 @@ mark_possibles(SQUARES squares, int y, int x, chtype mark)
 static bool
 find_next_move(SQUARES squares, HISTORY * doneData, int doneSize, int *y, int *x)
 {
 static bool
 find_next_move(SQUARES squares, HISTORY * doneData, int doneSize, int *y, int *x)
 {

-    unsigned j, k;
-    int found = -1;
-    int first = -1;
-    int next = -1;
-    int oldy, oldx;
-    int newy, newx;

     bool result = FALSE;
 
     if (doneSize > 1) {
     bool result = FALSE;
 
     if (doneSize > 1) {

-       oldy = doneData[doneSize - 1].y;
-       oldx = doneData[doneSize - 1].x;
+       unsigned j;
+       int oldy = doneData[doneSize - 1].y;
+       int oldx = doneData[doneSize - 1].x;
+       int found = -1;
+       int first = -1;
+       int next = -1;
+

        for (j = 0; j < MAX_OFFSET * 2; j++) {
        for (j = 0; j < MAX_OFFSET * 2; j++) {

-           k = j % MAX_OFFSET;
-           newy = oldy + offsets[k].y;
-           newx = oldx + offsets[k].x;
+           unsigned k = j % MAX_OFFSET;
+           int newy = oldy + offsets[k].y;
+           int newx = oldx + offsets[k].x;

            if (isUnusedYX(squares, newy, newx)) {
                if (first < 0)
                    first = (int) k;
            if (isUnusedYX(squares, newy, newx)) {
                if (first < 0)
                    first = (int) k;


@@ -500,12 +501,11 @@ recurBack(SQUARES squares, int y, int x, int total)
     int result;
 
     if (total < maxmoves) {
     int result;
 
     if (total < maxmoves) {

-       int try_x, try_y;

        unsigned k;
 
        for (k = 0; k < MAX_OFFSET; k++) {
        unsigned k;
 
        for (k = 0; k < MAX_OFFSET; k++) {

-           try_x = x + offsets[k].x;
-           try_y = y + offsets[k].y;
+           int try_x = x + offsets[k].x;
+           int try_y = y + offsets[k].y;

            if (isUnusedYX(squares, try_y, try_x)) {
                ++test_test;
                squares[try_y][try_x] = total + 1;
            if (isUnusedYX(squares, try_y, try_x)) {
                ++test_test;
                squares[try_y][try_x] = total + 1;