X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=gnushogi%2Fbook.c;h=5a331c92e8af906db2d24d33b6e2562fb9bf4afe;hb=1ad6c36feffec9aef9011a7585179f9e75b85600;hp=ae3956fa0b2910ed89e2752026f4ced80a43987f;hpb=95369c6cb63d6513f7381dc3cc92c1f34044c607;p=gnushogi.git diff --git a/gnushogi/book.c b/gnushogi/book.c index ae3956f..5a331c9 100644 --- a/gnushogi/book.c +++ b/gnushogi/book.c @@ -4,6 +4,7 @@ * ---------------------------------------------------------------------- * Copyright (c) 1993, 1994, 1995 Matthias Mutz * Copyright (c) 1999 Michael Vanier and the Free Software Foundation + * Copyright (c) 2008, 2013, 2014 Yann Dirson and the Free Software Foundation * * GNU SHOGI is based on GNU CHESS * @@ -365,7 +366,7 @@ RESET(void) static int -Vparse (FILE * fd, USHORT *mv, USHORT *flags, USHORT side, int moveno) +Vparse (FILE * fd, USHORT *mv, USHORT *flags, int moveno) { int c, i; char s[255]; @@ -646,7 +647,7 @@ GetOpenings(void) { short i; int mustwrite = false, first; - unsigned short xside, side; + unsigned short side; short c; USHORT mv, flags; unsigned int x; @@ -715,11 +716,10 @@ GetOpenings(void) { /* setvbuf(fd, buffr, _IOFBF, 2048); */ side = black; - xside = white; hashbd = hashkey = 0; i = 0; - while ((c = Vparse(fd, &mv, &flags, side, i)) >= 0) + while ((c = Vparse(fd, &mv, &flags, i)) >= 0) { if (c == 1) { @@ -821,7 +821,6 @@ GetOpenings(void) computer = opponent; opponent = computer ^ 1; - xside = side; side = side ^ 1; } else if (i > 0) @@ -832,8 +831,6 @@ GetOpenings(void) RESET(); i = 0; side = black; - xside = white; - } } @@ -875,8 +872,8 @@ GetOpenings(void) } - sprintf(msg, "Book used %d(%d).", B.bookcount, B.booksize); - ShowMessage(msg); + sprintf(msg, "Book used %lu(%lu).", B.bookcount, B.booksize); + dsp->ShowMessage(msg); } /* Set everything back to start the game. */ @@ -886,7 +883,7 @@ GetOpenings(void) /* Now get ready to play .*/ if (!B.bookcount) { - ShowMessage("Can't find book."); + dsp->ShowMessage("Can't find book."); Book = 0; } } @@ -894,7 +891,7 @@ GetOpenings(void) /* - * OpeningBook(hint, side) + * OpeningBook(hint) * * Go through each of the opening lines of play and check for a match with * the current game listing. If a match occurs, generate a random @@ -906,7 +903,7 @@ GetOpenings(void) */ int -OpeningBook(unsigned short *hint, short side) +OpeningBook(unsigned short *hint) { unsigned short r, m; int possibles = TrPnt[2] - TrPnt[1];