X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Fknight.c;h=bda7da38fc43967170162a98c59d816db2d52f9b;hp=b95996c608178b45eda852376796916560abd2c6;hb=f3ec084eb66ba14feb6357b674fb85dd474933d8;hpb=5d8dbcdd9423bf9821db414fd9ec792ccf1f1027

diff --git a/test/knight.c b/test/knight.c
index b95996c6..bda7da38 100644
--- a/test/knight.c
+++ b/test/knight.c
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 1998-2013,2017 Free Software Foundation, Inc.              *
+ * Copyright 2018-2019,2020 Thomas E. Dickey                                *
+ * Copyright 1998-2013,2017 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            *
@@ -33,7 +34,7 @@
  * Eric S. Raymond <esr@snark.thyrsus.com> July 22 1995.  Mouse support
  * added September 20th 1995.
  *
- * $Id: knight.c,v 1.43 2017/09/10 00:13:02 tom Exp $
+ * $Id: knight.c,v 1.47 2020/02/02 23:34:34 tom Exp $
  */
 
 #include <test.priv.h>
@@ -75,7 +76,9 @@ static WINDOW *boardwin;	/* the board window */
 static WINDOW *helpwin;		/* the help window */
 static WINDOW *msgwin;		/* the message window */
 
+#if HAVE_USE_DEFAULT_COLORS
 static bool d_option;
+#endif
 
 static chtype minus = '-';	/* possible-move character */
 static chtype oldch;
@@ -326,21 +329,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)
 {
-    unsigned j, k;
-    int found = -1;
-    int first = -1;
-    int next = -1;
-    int oldy, oldx;
-    int newy, newx;
     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++) {
-	    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;
@@ -417,7 +419,7 @@ drawMove(SQUARES squares, int count_moves, chtype tchar, int oldy, int oldx, int
 		} else {
 		    cellmove(i, j);
 		    if (winch(boardwin) == minus)
-			waddch(boardwin, count_moves ? ' ' : minus);
+			waddch(boardwin, ' ');
 		}
 	    }
 	}
@@ -500,12 +502,11 @@ recurBack(SQUARES squares, int y, int x, int total)
     int result;
 
     if (total < maxmoves) {
-	int try_x, try_y;
 	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;