 @@ -1,14 +1,14 @@
-/*	$NetBSD: gomoku.h,v 1.22 2022/05/15 22:00:11 rillig Exp $	*/
+/*	$NetBSD: gomoku.h,v 1.23 2022/05/15 22:18:36 rillig Exp $	*/
 /*
  * Copyright (c) 1994
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Ralph Campbell.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -65,46 +65,26 @@
 #define BLACK	0
 #define WHITE	1
 #define EMPTY	2
 #define BORDER	3
 /* return values for makemove() */
 #define MOVEOK	0
 #define RESIGN	1
 #define ILLEGAL	2
 #define WIN	3
 #define TIE	4
 #define SAVE	5
 #define A 1
 #define B 2
 #define C 3
 #define D 4
 #define E 5
 #define F 6
 #define G 7
 #define H 8
 #define J 9
 #define K 10
 #define L 11
 #define M 12
 #define N 13
 #define O 14
 #define P 15
 #define Q 16
 #define R 17
 #define S 18
 #define T 19
 #define PT(x, y)	((x) + BSZ1 * (y))
 /*
  * A 'frame' is a group of five or six contiguous board locations.
  * An open ended frame is one with spaces on both ends; otherwise, its closed.
  * A 'combo' is a group of intersecting frames and consists of two numbers:
  * 'A' is the number of moves to make the combo non-blockable.
  * 'B' is the minimum number of moves needed to win once it can't be blocked.
  * A 'force' is a combo that is one move away from being non-blockable
+ *
  * Single frame combo values:
  *     <A,B>	board values
  *	5,0	. . . . . O

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pickmove.c,v 1.25 2022/05/15 22:08:05 rillig Exp $	*/
+/*	$NetBSD: pickmove.c,v 1.26 2022/05/15 22:18:36 rillig Exp $	*/
 /*
  * Copyright (c) 1994
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Ralph Campbell.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -27,27 +27,27 @@
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)pickmove.c	8.2 (Berkeley) 5/3/95";
 #else
-__RCSID("$NetBSD: pickmove.c,v 1.25 2022/05/15 22:08:05 rillig Exp $");
+__RCSID("$NetBSD: pickmove.c,v 1.26 2022/05/15 22:18:36 rillig Exp $");
 #endif
 #endif /* not lint */
 #include <stdlib.h>
 #include <string.h>
 #include <curses.h>
 #include <limits.h>
 #include "gomoku.h"
 #define BITS_PER_INT	(sizeof(int) * CHAR_BIT)
 #define MAPSZ		(BAREA / BITS_PER_INT)
 @@ -78,51 +78,51 @@ static int checkframes(struct combostr *
 static int sortcombo(struct combostr **, struct combostr **, struct combostr *);
 static void printcombo(struct combostr *, char *, size_t);
 int
 pickmove(int us)
+{
 	struct spotstr *sp, *sp1, *sp2;
 	union comboval *Ocp, *Tcp;
 	unsigned pos;
 	int m;
 	/* first move is easy */
 	if (movenum == 1)
-		return PT(K, 10);
+		return PT((BSZ + 1) / 2, (BSZ + 1) / 2);
 	/* initialize all the board values */
-	for (pos = PT(T, 20); pos-- > PT(A, 1); ) {
+	for (pos = PT(BSZ, BSZ + 1); pos-- > PT(1, 1); ) {
 		sp = &board[pos];
 		sp->s_combo[BLACK].s = MAXCOMBO + 1;
 		sp->s_combo[WHITE].s = MAXCOMBO + 1;
 		sp->s_level[BLACK] = 255;
 		sp->s_level[WHITE] = 255;
 		sp->s_nforce[BLACK] = 0;
 		sp->s_nforce[WHITE] = 0;
 		sp->s_flags &= ~(FFLAGALL | MFLAGALL);
+	}
 	nforce = 0;
 	memset(forcemap, 0, sizeof(forcemap));
 	/* compute new values */
 	nextcolor = us;
 	scanframes(BLACK);
 	scanframes(WHITE);
 	/* find the spot with the highest value */
-	pos = PT(T, 19);
+	pos = PT(BSZ, BSZ);
 	sp1 = sp2 = &board[pos];
-	for ( ; pos-- > PT(A, 1); ) {
+	for ( ; pos-- > PT(1, 1); ) {
 		sp = &board[pos];
 		if (sp->s_occ != EMPTY)
 			continue;
 		if (debug && (sp->s_combo[BLACK].c.a == 1 ||
 		    sp->s_combo[WHITE].c.a == 1)) {
 			debuglog("- %s %x/%d %d %x/%d %d %d",
 			    stoc(sp - board),
 			    sp->s_combo[BLACK].s, sp->s_level[BLACK],
 			    sp->s_nforce[BLACK],
 			    sp->s_combo[WHITE].s, sp->s_level[WHITE],
 			    sp->s_nforce[WHITE],
 			    sp->s_wval);
+		}
 @@ -342,27 +342,27 @@ scanframes(int color)
 	d = 2;
 	while (d <= ((movenum + 1) >> 1) && combolen > n) {
 		if (debug) {
 			debuglog("%cL%d %d %d %d", "BW"[color],
 			    d, combolen - n, combocnt, elistcnt);
 			refresh();
+		}
 		n = combolen;
 		addframes(d);
 		d++;
+	}
 	/* scan for combos at empty spots */
-	for (pos = PT(T, 20); pos-- > PT(A, 1); ) {
+	for (pos = PT(BSZ, BSZ + 1); pos-- > PT(1, 1); ) {
 		sp = &board[pos];
 		for (ep = sp->s_empty; ep; ep = nep) {
 			cbp = ep->e_combo;
 			if (cbp->c_combo.s <= sp->s_combo[color].s) {
 				if (cbp->c_combo.s != sp->s_combo[color].s) {
 					sp->s_combo[color].s = cbp->c_combo.s;
 					sp->s_level[color] = cbp->c_nframes;
 				} else if (cbp->c_nframes < sp->s_level[color])
 					sp->s_level[color] = cbp->c_nframes;
+			}
 			nep = ep->e_next;
 			free(ep);
 			elistcnt--;
 @@ -552,27 +552,27 @@ addframes(int level)
+{
 	struct combostr *cbp, *ecbp;
 	struct spotstr *sp, *fsp;
 	struct elist *ep, *nep;
 	int i, r, d;
 	struct combostr **cbpp, *pcbp;
 	union comboval fcb, cb;
 	unsigned pos;
 	curlevel = level;
 	/* scan for combos at empty spots */
 	i = curcolor;
-	for (pos = PT(T, 20); pos-- > PT(A, 1); ) {
+	for (pos = PT(BSZ, BSZ + 1); pos-- > PT(1, 1); ) {
 		sp = &board[pos];
 		for (ep = sp->s_empty; ep; ep = nep) {
 			cbp = ep->e_combo;
 			if (cbp->c_combo.s <= sp->s_combo[i].s) {
 				if (cbp->c_combo.s != sp->s_combo[i].s) {
 					sp->s_combo[i].s = cbp->c_combo.s;
 					sp->s_level[i] = cbp->c_nframes;
 				} else if (cbp->c_nframes < sp->s_level[i])
 					sp->s_level[i] = cbp->c_nframes;
+			}
 			nep = ep->e_next;
 			free(ep);
 			elistcnt--;