gameInfo.holdingsWidth = newHoldingsWidth;\r
gameInfo.variant = newVariant;\r
InitDrawingSizes(-2, 0);\r
+\r
+ if(board != boards[0]) InitPosition(FALSE);\r
+\r
} else gameInfo.variant = newVariant;\r
}\r
\r
fromX = fromY = toX = toY = -1;\r
} else {\r
/* Move from ICS was illegal!? Punt. */\r
+ if (appData.debugMode) {\r
+ fprintf(debugFP, "Illegal move from ICS '%s'\n", move_str);\r
+ fprintf(debugFP, "board L=%d, R=%d, H=%d, holdings=%d\n", BOARD_LEFT, BOARD_RGHT, BOARD_HEIGHT, gameInfo.holdingsWidth);\r
+ }\r
#if 0\r
if (appData.testLegality && appData.debugMode) {\r
sprintf(str, "Illegal move \"%s\" from ICS", move_str);\r
} else {\r
sprintf(buf, "%s\n", parseList[moveNum]);\r
}\r
- /* [HGM] decrement all digits to code ranks starting from 0 */\r
- if(BOARD_HEIGHT>9) {\r
- char *p = buf;\r
- while(*p) { if(*p < 'A') (*p)--; p++; }\r
- }\r
SendToProgram(buf, cps);\r
} else {\r
/* Added by Tord: Send castle moves in "O-O" in FRC games if required by\r
void\r
AlphaRank(char *move, int n)\r
{\r
- char *p = move, c;\r
+ char *p = move, c; int x, y;\r
\r
if( !appData.alphaRank ) return;\r
\r
- while(c = *p) {\r
- if(c>='0' && c<='9') *p += AAA-ONE; else\r
- if(c>='a' && c<'x') *p -= AAA-ONE;\r
- p++;\r
- if(--n < 1) break;\r
+ if (appData.debugMode) {\r
+ fprintf(debugFP, "alphaRank(%s,%d)\n", move, n);\r
+ }\r
+\r
+ if(move[1]=='*' && \r
+ move[2]>='0' && move[2]<='9' &&\r
+ move[3]>='a' && move[3]<='x' ) {\r
+ move[2] = (move[2]-'1')+BOARD_LEFT + AAA;\r
+ move[3] = (move[3]-'a') + ONE;\r
+ } else\r
+ if(move[0]>='0' && move[0]<='9' &&\r
+ move[1]>='a' && move[1]<='x' &&\r
+ move[2]>='0' && move[2]<='9' &&\r
+ move[3]>='a' && move[3]<='x' ) {\r
+ /* input move, Shogi -> normal */\r
+/*\r
+ move[0] = BOARD_RGHT -1-(move[0]-'1') + AAA;\r
+ move[1] = BOARD_HEIGHT-1-(move[1]-'a') + ONE;\r
+ move[2] = BOARD_RGHT -1-(move[2]-'1') + AAA;\r
+ move[3] = BOARD_HEIGHT-1-(move[3]-'a') + ONE;\r
+*/\r
+ move[0] = (move[0]-'1')+BOARD_LEFT + AAA;\r
+ move[1] = (move[1]-'a') + ONE;\r
+ move[2] = (move[2]-'1')+BOARD_LEFT + AAA;\r
+ move[3] = (move[3]-'a') + ONE;\r
+ } else\r
+ if(move[1]=='@' &&\r
+ move[3]>='0' && move[3]<='9' &&\r
+ move[2]>='a' && move[2]<='x' ) {\r
+ move[1] = '*';\r
+ move[2] = (move[2]-AAA)-BOARD_LEFT + '1';\r
+ move[3] = (move[3]-ONE) + 'a';\r
+ } else\r
+ if(\r
+ move[0]>='a' && move[0]<='x' &&\r
+ move[3]>='0' && move[3]<='9' &&\r
+ move[2]>='a' && move[2]<='x' ) {\r
+ /* output move, normal -> Shogi */\r
+/*\r
+ move[0] = BOARD_RGHT -1-(move[0]-AAA) + '1';\r
+ move[1] = BOARD_HEIGHT-1-(move[1]-ONE) + 'a';\r
+ move[2] = BOARD_RGHT -1-(move[2]-AAA) + '1';\r
+ move[3] = BOARD_HEIGHT-1-(move[3]-ONE) + 'a';\r
+*/\r
+ move[0] = (move[0]-AAA)-BOARD_LEFT + '1';\r
+ move[1] = (move[1]-ONE) + 'a';\r
+ move[2] = (move[2]-AAA)-BOARD_LEFT + '1';\r
+ move[3] = (move[3]-ONE) + 'a';\r
+ if(move[4] == PieceToChar(BlackQueen)) move[4] = '+';\r
+ }\r
+ if (appData.debugMode) {\r
+ fprintf(debugFP, " out = '%s'\n", move);\r
}\r
}\r
\r
if (appData.debugMode) {\r
fprintf(debugFP, "move to parse: %s\n", move);\r
}\r
- AlphaRank(move, 10);\r
*moveType = yylexstr(moveNum, move);\r
\r
switch (*moveType) {\r
-#ifdef FAIRY\r
case WhitePromotionChancellor:\r
case BlackPromotionChancellor:\r
case WhitePromotionArchbishop:\r
case BlackPromotionArchbishop:\r
-#endif\r
case WhitePromotionQueen:\r
case BlackPromotionQueen:\r
case WhitePromotionRook:\r
*promoChar = currentMoveString[4];\r
if (*fromX < BOARD_LEFT || *fromX >= BOARD_RGHT || *fromY < 0 || *fromY >= BOARD_HEIGHT ||\r
*toX < BOARD_LEFT || *toX >= BOARD_RGHT || *toY < 0 || *toY >= BOARD_HEIGHT) {\r
+ if (appData.debugMode) {\r
+ fprintf(debugFP, "Off-board move (%d,%d)-(%d,%d)%c, type = %d\n", *fromX, *fromY, *toX, *toY, *promoChar, *moveType);\r
+ }\r
*fromX = *fromY = *toX = *toY = 0;\r
return FALSE;\r
}\r
case BlackWins:\r
case GameIsDrawn:\r
default:\r
+ if (appData.debugMode) {\r
+ fprintf(debugFP, "Impossible move %s, type = %d\n", currentMoveString, *moveType);\r
+ }\r
/* bug? */\r
*fromX = *fromY = *toX = *toY = 0;\r
*promoChar = NULLCHAR;\r
}\r
\r
initialRulePlies = 0; /* 50-move counter start */\r
+\r
+ castlingRank[0] = castlingRank[1] = castlingRank[2] = 0;\r
+ castlingRank[3] = castlingRank[4] = castlingRank[5] = BOARD_HEIGHT-1;\r
}\r
\r
\r
castlingRights[0][6] = initialRights[2] = 5;\r
castlingRights[0][7] = initialRights[5] = 5;\r
castlingRank[6] = 0;\r
- castlingRank[6] = BOARD_HEIGHT-1;\r
+ castlingRank[7] = BOARD_HEIGHT-1;\r
startedFromSetupPosition = TRUE;\r
break;\r
case VariantCapablanca:\r
gameInfo.boardHeight = 9;\r
gameInfo.holdingsSize = 7;\r
nrCastlingRights = 0;\r
- SetCharTable(pieceToChar, "PNBRLSG.........Kpnbrlsg.........k"); \r
+ SetCharTable(pieceToChar, "PNBRLSG...++++++Kpnbrlsg...++++++k"); \r
break;\r
case VariantShowgi:\r
pieces = ShogiArray;\r
break;\r
case VariantKnightmate:\r
pieces = KnightmateArray;\r
- strcpy(pieceToChar, "P.BRQ...M.K......p.brq...m.k......"); \r
+ SetCharTable(pieceToChar, "P.BRQ...M.K......p.brq...m.k......"); \r
break;\r
case VariantFairy:\r
pieces = fairyArray;\r
case VariantCrazyhouse:\r
case VariantBughouse:\r
pieces = FIDEArray;\r
+ SetCharTable(pieceToChar, "PNBRQ......~~~~.Kpnbrq......~~~~.k"); \r
gameInfo.holdingsSize = 5;\r
break;\r
case VariantWildCastle:\r
castlingRights[0][3] = initialRights[3] = BOARD_RGHT-1;\r
castlingRights[0][4] = initialRights[4] = BOARD_LEFT;\r
castlingRights[0][5] = initialRights[5] = BOARD_WIDTH>>1;\r
-\r
- castlingRank[0] = castlingRank[1] = castlingRank[2] = 0;\r
- castlingRank[3] = castlingRank[4] = castlingRank[5] = BOARD_HEIGHT-1;\r
}\r
\r
if(gameInfo.variant == VariantFischeRandom) {\r
return ImpossibleMove;\r
}\r
\r
+ /* [HGM] suppress all moves into holdings area and guard band */\r
+ if( toX < BOARD_LEFT || toX >= BOARD_RGHT || toY < 0 )\r
+ return ImpossibleMove;\r
+\r
+ /* [HGM] <sameColor> moved to here from winboard.c */\r
+ /* note: this code seems to exist for filtering out some obviously illegal premoves */\r
+ pdown = boards[currentMove][fromY][fromX];\r
+ pup = boards[currentMove][toY][toX];\r
+ if ( gameMode != EditPosition &&\r
+ (WhitePawn <= pdown && pdown < BlackPawn &&\r
+ WhitePawn <= pup && pup < BlackPawn ||\r
+ BlackPawn <= pdown && pdown < EmptySquare &&\r
+ BlackPawn <= pup && pup < EmptySquare) )\r
+ return ImpossibleMove;\r
+\r
/* Check if the user is playing in turn. This is complicated because we\r
let the user "pick up" a piece before it is his turn. So the piece he\r
tried to pick up may have been captured by the time he puts it down!\r
return ImpossibleMove;\r
}\r
\r
- /* [HGM] suppress all moves into holdings area and guard band */\r
- if( toX < BOARD_LEFT || toX >= BOARD_RGHT || toY < 0 )\r
- return ImpossibleMove;\r
-\r
- /* [HGM] <sameColor> moved to here from winboard.c */\r
- /* note: EditPosition already filtered out and performed! */\r
- pdown = boards[currentMove][fromY][fromX];\r
- pup = boards[currentMove][toY][toX];\r
- if ( \r
- (WhitePawn <= pdown && pdown < BlackPawn &&\r
- WhitePawn <= pup && pup < BlackPawn) ||\r
- (BlackPawn <= pdown && pdown < EmptySquare &&\r
- BlackPawn <= pup && pup < EmptySquare) )\r
- return ImpossibleMove;\r
-\r
/* [HGM] If move started in holdings, it means a drop */\r
if( fromX == BOARD_LEFT-2 || fromX == BOARD_RGHT+1) { \r
if( pup != EmptySquare ) return ImpossibleMove;\r
return;\r
}\r
\r
+ AlphaRank(machineMove, 4);\r
if (!ParseOneMove(machineMove, forwardMostMove, &moveType,\r
&fromX, &fromY, &toX, &toY, &promoChar)) {\r
/* Machine move could not be parsed; ignore it. */\r
count = 0;\r
for(k = forwardMostMove-2;\r
k>=backwardMostMove && k>=forwardMostMove-100 &&\r
- epStatus[k] <= EP_NONE && epStatus[k+1] <= EP_NONE;\r
+ epStatus[k] < EP_UNKNOWN &&\r
+ epStatus[k+2] <= EP_NONE && epStatus[k+1] <= EP_NONE;\r
k-=2)\r
{ int rights=0;\r
if (appData.debugMode) {\r
} else if (strncmp(message, "Black resign", 12) == 0) {\r
GameEnds(WhiteWins, "Black resigns", GE_ENGINE1 + (cps != &first));\r
return;\r
+ } else if (strncmp(message, "White matches", 13) == 0 ||\r
+ strncmp(message, "Black matches", 13) == 0 ) {\r
+ /* [HGM] ignore GNUShogi noises */\r
+ return;\r
} else if (strncmp(message, "White", 5) == 0 &&\r
message[5] != '(' &&\r
StrStr(message, "Black") == NULL) {\r
yyboardindex = boardIndex;\r
moveType = (ChessMove) yylex();\r
switch (moveType) {\r
-#ifdef FAIRY\r
+ case IllegalMove: /* maybe suicide chess, etc. */\r
+ if (appData.debugMode) {\r
+ fprintf(debugFP, "Illegal move from ICS: '%s'\n", yy_text);\r
+ fprintf(debugFP, "board L=%d, R=%d, H=%d, holdings=%d\n", BOARD_LEFT, BOARD_RGHT, BOARD_HEIGHT, gameInfo.holdingsWidth);\r
+ setbuf(debugFP, NULL);\r
+ }\r
case WhitePromotionChancellor:\r
case BlackPromotionChancellor:\r
case WhitePromotionArchbishop:\r
case BlackPromotionArchbishop:\r
-#endif\r
case WhitePromotionQueen:\r
case BlackPromotionQueen:\r
case WhitePromotionRook:\r
case BlackHSideCastleFR:\r
case BlackASideCastleFR:\r
/* POP Fabien */\r
- case IllegalMove: /* maybe suicide chess, etc. */\r
fromX = currentMoveString[0] - AAA;\r
fromY = currentMoveString[1] - ONE;\r
toX = currentMoveString[2] - AAA;\r
case AmbiguousMove:\r
/* bug? */\r
sprintf(buf, "Ambiguous move in ICS output: \"%s\"", yy_text);\r
+ if (appData.debugMode) {\r
+ fprintf(debugFP, "Ambiguous move from ICS: '%s'\n", yy_text);\r
+ fprintf(debugFP, "board L=%d, R=%d, H=%d, holdings=%d\n", BOARD_LEFT, BOARD_RGHT, BOARD_HEIGHT, gameInfo.holdingsWidth);\r
+ setbuf(debugFP, NULL);\r
+ }\r
DisplayError(buf, 0);\r
return;\r
case ImpossibleMove:\r
/* bug? */\r
sprintf(buf, "Illegal move in ICS output: \"%s\"", yy_text);\r
+ if (appData.debugMode) {\r
+ fprintf(debugFP, "Impossible move from ICS: '%s'\n", yy_text);\r
+ fprintf(debugFP, "board L=%d, R=%d, H=%d, holdings=%d\n", BOARD_LEFT, BOARD_RGHT, BOARD_HEIGHT, gameInfo.holdingsWidth);\r
+ setbuf(debugFP, NULL);\r
+ }\r
DisplayError(buf, 0);\r
return;\r
case (ChessMove) 0: /* end of file */\r
if( boards[forwardMostMove][fromY][fromX] == WhitePawn ) {\r
epStatus[forwardMostMove] = EP_PAWN_MOVE; \r
if( toY-fromY==2 &&\r
- (toX>BOARD_LEFT+1 && boards[forwardMostMove][toY][toX-1] == BlackPawn ||\r
+ (toX>BOARD_LEFT && boards[forwardMostMove][toY][toX-1] == BlackPawn ||\r
toX<BOARD_RGHT-1 && boards[forwardMostMove][toY][toX+1] == BlackPawn ) )\r
epStatus[forwardMostMove] = toX;\r
} else \r
if( boards[forwardMostMove][fromY][fromX] == BlackPawn ) {\r
epStatus[forwardMostMove] = EP_PAWN_MOVE; \r
if( toY-fromY== -2 &&\r
- (toX>BOARD_LEFT+1 && boards[forwardMostMove][toY][toX-1] == WhitePawn ||\r
+ (toX>BOARD_LEFT && boards[forwardMostMove][toY][toX-1] == WhitePawn ||\r
toX<BOARD_RGHT-1 && boards[forwardMostMove][toY][toX+1] == WhitePawn ) )\r
epStatus[forwardMostMove] = toX;\r
}\r
castlingRights[forwardMostMove][i] == toX && castlingRank[i] == toY \r
) castlingRights[forwardMostMove][i] = -1; // revoke for moved or captured piece\r
\r
+\r
+\r
}\r
\r
}\r
claimer = whosays == GE_ENGINE1 ? /* color of claimer */\r
first.twoMachinesColor[0] :\r
second.twoMachinesColor[0] ;\r
- if( result == WhiteWins && claimer == 'w' ||\r
- result == BlackWins && claimer == 'b' ) {\r
+ if( gameInfo.holdingsWidth == 0 &&\r
+ (result == WhiteWins && claimer == 'w' ||\r
+ result == BlackWins && claimer == 'b' ) ) {\r
/* Xboard immediately adjudicates all mates, so win claims must be false */\r
sprintf(buf, "False win claim: '%s'", resultDetails);\r
result = claimer == 'w' ? BlackWins : WhiteWins;\r
else { *p++ = '0' + emptycount/10; *p++ = '0' + emptycount%10; }\r
emptycount = 0;\r
}\r
- if(gameInfo.variant == VariantShogi) {\r
- /* [HGM] write Shogi promoted pieces as +<unpromoted> */\r
- if( (int)piece > (int) WhiteCannon && (int)piece < (int) WhiteKing ||\r
- (int)piece > (int) BlackCannon && (int)piece < (int) BlackKing ) {\r
- *p++ = '+';\r
- piece = (ChessSquare)(DEMOTED piece);\r
- }\r
+ if(PieceToChar(piece) == '+') {\r
+ /* [HGM] write promoted pieces as '+<unpromoted>' (Shogi) */\r
+ *p++ = '+';\r
+ piece = (ChessSquare)(DEMOTED piece);\r
} \r
*p++ = PieceToChar(piece);\r
- if(gameInfo.variant == VariantCrazyhouse || gameInfo.variant == VariantBughouse) {\r
- /* [HGM] flag Crazyhouse promoted pieces */\r
- if( (int)piece > (int) WhiteQueen && (int)piece < (int) WhiteKing ||\r
- (int)piece > (int) BlackQueen && (int)piece < (int) BlackKing ) {\r
- p[-1] = PieceToChar((ChessSquare)(DEMOTED piece));\r
- *p++ = '~';\r
- }\r
+ if(p[-1] == '~') {\r
+ /* [HGM] flag promoted pieces as '<promoted>~' (Crazyhouse) */\r
+ p[-1] = PieceToChar((ChessSquare)(DEMOTED piece));\r
+ *p++ = '~';\r
}\r
}\r
}\r
*p++ = whiteToPlay ? 'w' : 'b';\r
*p++ = ' ';\r
\r
+ if(nrCastlingRights) {\r
/* HACK: we don't keep track of castling availability, so fake it! */\r
/* Tord! please fix with the aid of castlingRights[move][...] */\r
\r
}\r
\r
/* POP Fabien & Tord */\r
+ }\r
\r
+ if(gameInfo.variant != VariantShogi && gameInfo.variant != VariantXiangqi &&\r
+ gameInfo.variant != VariantShatranj && gameInfo.variant != VariantCourier ) { \r
/* En passant target square */\r
if (move > backwardMostMove) {\r
fromX = moveList[move - 1][0] - AAA;\r
} else {\r
*p++ = '-';\r
}\r
+ *p++ = ' ';\r
+ }\r
\r
/* [HGM] print Crazyhouse or Shogi holdings */\r
if( gameInfo.holdingsWidth ) {\r
- *p++ = ' '; q = p;\r
+ q = p;\r
for(i=0; i<gameInfo.holdingsSize; i++) { /* white holdings */\r
piece = boards[move][i][BOARD_WIDTH-1];\r
if( piece != EmptySquare )\r
/* [HGM] find reversible plies */\r
{ int i = 0, j=move;\r
\r
- if (appData.debugMode) { int k;\r
- fprintf(debugFP, "write FEN 50-move: %d %d %d\n", initialRulePlies, forwardMostMove, backwardMostMove);\r
- for(k=backwardMostMove; k<=forwardMostMove; k++)\r
- fprintf(debugFP, "e%d. p=%d\n", k, epStatus[k]);\r
+ if (appData.debugMode) { int k;\r
+ fprintf(debugFP, "write FEN 50-move: %d %d %d\n", initialRulePlies, forwardMostMove, backwardMostMove);\r
+ for(k=backwardMostMove; k<=forwardMostMove; k++)\r
+ fprintf(debugFP, "e%d. p=%d\n", k, epStatus[k]);\r
\r
- }\r
+ }\r
\r
while(j > backwardMostMove && epStatus[j] <= EP_NONE) j--,i++;\r
if( j == backwardMostMove ) i += initialRulePlies;\r
- sprintf(p, " %d", i);\r
- p += i>=100 ? 4 : i >= 10 ? 3 : 2;\r
+ sprintf(p, "%d ", i);\r
+ p += i>=100 ? 4 : i >= 10 ? 3 : 2;\r
}\r
/* Fullmove number */\r
- sprintf(p, " %d", (move / 2) + 1);\r
+ sprintf(p, "%d", (move / 2) + 1);\r
\r
return StrSave(buf);\r
}\r
p = fen;\r
\r
/* [HGM] by default clear Crazyhouse holdings, if present */\r
- if(gameInfo.holdingsWidth) {\r
+ if(gameInfo.holdingsWidth) {\r
for(i=0; i<BOARD_HEIGHT; i++) {\r
board[i][0] = EmptySquare; /* black holdings */\r
board[i][BOARD_WIDTH-1] = EmptySquare; /* white holdings */\r
board[i][1] = (ChessSquare) 0; /* black counts */\r
board[i][BOARD_WIDTH-2] = (ChessSquare) 0; /* white counts */\r
}\r
- }\r
+ }\r
\r
/* Piece placement data */\r
for (i = BOARD_HEIGHT - 1; i >= 0; i--) {\r
board[i][(j++)+gameInfo.holdingsWidth] = EmptySquare;\r
} else if (*p == '+' || isalpha(*p)) {\r
if (j >= gameInfo.boardWidth) return FALSE;\r
- if(*p=='+') { piece = (ChessSquare) (PROMOTED CharToPiece(*++p) ); p++; }\r
- else piece = CharToPiece(*p++);\r
+ if(*p=='+') {\r
+ piece = CharToPiece(*++p);\r
+ if(piece == EmptySquare) return FALSE; /* unknown piece */\r
+ piece = (ChessSquare) (PROMOTED piece ); p++;\r
+ if(PieceToChar(piece) != '+') return FALSE; /* unpromotable piece */\r
+ } else piece = CharToPiece(*p++);\r
+\r
+ if(piece==EmptySquare) return FALSE; /* unknown piece */\r
if(*p == '~') { /* [HGM] make it a promoted piece for Crazyhouse */\r
piece = (ChessSquare) (PROMOTED piece);\r
+ if(PieceToChar(piece) != '~') return FALSE; /* cannot be a promoted piece */\r
p++;\r
}\r
board[i][(j++)+gameInfo.holdingsWidth] = piece;\r
\r
/* [HGM] We NO LONGER ignore the rest of the FEN notation */\r
/* return the extra info in global variiables */\r
- {\r
+\r
/* set defaults in case FEN is incomplete */\r
FENepStatus = EP_UNKNOWN;\r
for(i=0; i<nrCastlingRights; i++ ) {\r
FENrulePlies = 0;\r
\r
while(*p==' ') p++;\r
-\r
- if(*p=='K' || *p=='Q' || *p=='k' || *p=='q' || *p=='-') {\r
- /* castling indicator present, so default is no castlings */\r
- for(i=0; i<nrCastlingRights; i++ ) {\r
- FENcastlingRights[i] = -1;\r
- }\r
- }\r
- while(*p=='K' || *p=='Q' || *p=='k' || *p=='q' || *p=='-') {\r
+ if(nrCastlingRights) {\r
+ if(*p=='K' || *p=='Q' || *p=='k' || *p=='q' || *p=='-') {\r
+ /* castling indicator present, so default becomes no castlings */\r
+ for(i=0; i<nrCastlingRights; i++ ) {\r
+ FENcastlingRights[i] = -1;\r
+ }\r
+ }\r
+ while(*p=='K' || *p=='Q' || *p=='k' || *p=='q' || *p=='-') {\r
switch(*p++) {\r
case'K':\r
FENcastlingRights[0] = BOARD_RGHT-1;\r
break;\r
/* Tord! FRC! */\r
}\r
- }\r
-\r
- while(*p==' ') p++;\r
+ }\r
\r
+ while(*p==' ') p++;\r
+ }\r
\r
- if(*p=='-') {\r
+ /* read e.p. field in games that know e.p. capture */\r
+ if(gameInfo.variant != VariantShogi && gameInfo.variant != VariantXiangqi &&\r
+ gameInfo.variant != VariantShatranj && gameInfo.variant != VariantCourier ) { \r
+ if(*p=='-') {\r
p++; FENepStatus = EP_NONE;\r
- } else {\r
- char c = *p++ - AAA;\r
+ } else {\r
+ char c = *p++ - AAA;\r
\r
- if(c < BOARD_LEFT || c >= BOARD_RGHT) return TRUE;\r
- if(*p >= '0' && *p <='9') *p++;\r
- FENepStatus = c;\r
+ if(c < BOARD_LEFT || c >= BOARD_RGHT) return TRUE;\r
+ if(*p >= '0' && *p <='9') *p++;\r
+ FENepStatus = c;\r
+ }\r
}\r
\r
/* [HGM] look for Crazyhouse holdings here */\r
while(*p==' ') p++;\r
- if( !isdigit(*p) ) {\r
+ if( gameInfo.holdingsWidth ) {\r
if(*p == '-' ) *p++; /* empty holdings */ else {\r
if( !gameInfo.holdingsWidth ) return FALSE; /* no room to put holdings! */\r
/* if we would allow FEN reading to set board size, we would */\r
}\r
\r
\r
-\r
if(sscanf(p, "%d", &i) == 1) {\r
FENrulePlies = i; /* 50-move ply counter */\r
/* (The move number is still ignored) */\r
}\r
- }\r
+\r
return TRUE;\r
}\r
\r
\r
#define LAST_PTY_LETTER 'q'\r
\r
-#define PATCHLEVEL "8"\r
+#define PATCHLEVEL "12"\r
\r
#define PRODUCT "WinBoard"\r
\r
if (!BlackPiece(board[rf][ff])) continue;\r
}\r
m = 0; piece = board[rf][ff];\r
- if(gameInfo.variant == VariantCrazyhouse &&\r
- ( (int) piece > (int) WhiteQueen && (int) piece < (int) WhiteKing\r
- || (int) piece > (int) BlackQueen && (int) piece < (int) BlackKing ))\r
+ if(PieceToChar(piece) == '~') \r
piece = (ChessSquare) ( DEMOTED piece );\r
if(gameInfo.variant == VariantShogi)\r
piece = (ChessSquare) ( SHOGI piece );\r
/* can't happen ([HGM] except for faries...) */\r
break;\r
\r
- case WhitePawn:\r
+ case WhitePawn:\r
if(gameInfo.variant == VariantXiangqi) {\r
/* [HGM] capture and move straight ahead in Xiangqi */\r
if (rf < BOARD_HEIGHT-1 &&\r
{\r
register DisambiguateClosure *cl = (DisambiguateClosure *) closure;\r
\r
- if ((cl->pieceIn == EmptySquare || cl->pieceIn == board[rf][ff]) &&\r
+ if ((cl->pieceIn == EmptySquare || cl->pieceIn == board[rf][ff]\r
+ || PieceToChar(board[rf][ff]) == '~'\r
+ && cl->pieceIn == (ChessSquare)(DEMOTED board[rf][ff])\r
+ ) &&\r
(cl->rfIn == -1 || cl->rfIn == rf) &&\r
(cl->ffIn == -1 || cl->ffIn == ff) &&\r
(cl->rtIn == -1 || cl->rtIn == rt) &&\r
(CoordsToAlgebraicClosure *) closure;\r
\r
if (rt == cl->rt && ft == cl->ft &&\r
- board[rf][ff] == cl->piece) {\r
+ (board[rf][ff] == cl->piece\r
+ || PieceToChar(board[rf][ff]) == '~' &&\r
+ (ChessSquare) (DEMOTED board[rf][ff]) == cl->piece)\r
+ ) {\r
if (rf == cl->rf) {\r
if (ff == cl->ff) {\r
cl->kind = kind; /* this is the move we want */\r
{\r
ChessSquare piece;\r
ChessMove kind;\r
- char *outp = out;\r
+ char *outp = out, c;\r
CoordsToAlgebraicClosure cl;\r
\r
if (rf == DROP_RANK) {\r
*outp++ = rt + ONE;\r
else { *outp++ = (rt+ONE-'0')/10 + '0';*outp++ = (rt+ONE-'0')%10 + '0'; }\r
*outp = NULLCHAR;\r
- AlphaRank(out, 5);\r
return (flags & F_WHITE_ON_MOVE) ? WhiteDrop : BlackDrop;\r
}\r
\r
if (promoChar == 'x') promoChar = NULLCHAR;\r
piece = board[rf][ff];\r
+ if(PieceToChar(piece)=='~') piece = (ChessSquare)(DEMOTED piece);\r
\r
if (appData.debugMode)\r
fprintf(debugFP, "CoordsToAlgebraic, piece=%d\n", (int)piece);\r
switch (piece) {\r
case WhitePawn:\r
case BlackPawn:\r
- if (appData.debugMode)\r
- fprintf(debugFP, "CoordsToAlgebraic, Pawn\n");\r
kind = LegalityTest(board, flags, epfile, initialRights, rf, ff, rt, ft, promoChar);\r
if (kind == IllegalMove && !(flags&F_IGNORE_CHECK)) {\r
/* Keep short notation if move is illegal only because it\r
}\r
*outp = NULLCHAR;\r
}\r
- AlphaRank(out, 10);\r
return kind;\r
\r
\r
else "N1f3" or "N5xf7",\r
else "Ng1f3" or "Ng5xf7".\r
*/\r
- if(PieceToChar(piece) == '.') {\r
+ c = PieceToChar(piece) ;\r
+ if( c == '~' || c == '+') {\r
/* [HGM] print nonexistent piece as its demoted version */\r
piece = (ChessSquare) (DEMOTED piece);\r
- if( gameInfo.variant == VariantShogi )\r
- *outp++ = '+';\r
}\r
+ if(c=='+') *outp++ = c;\r
*outp++ = ToUpper(PieceToChar(piece));\r
+\r
if (cl.file || (cl.either && !cl.rank)) {\r
*outp++ = ff + AAA;\r
}\r
}\r
}\r
}\r
- AlphaRank(out, 10);\r
return cl.kind;\r
\r
/* [HGM] Always long notation for fairies we don't know */\r
}\r
*outp = NULLCHAR;\r
\r
- AlphaRank(out, 0);\r
return IllegalMove;\r
}\r
\r
int skip1 = 0, skip2 = 0, skip3 = 0, promoted = 0;\r
ChessSquare piece;\r
ChessMove result;\r
+ char c;\r
\r
if (yyskipmoves) return (int) AmbiguousMove; /* not disambiguated */\r
\r
piece = boards[yyboardindex]\r
[currentMoveString[1] - ONE][currentMoveString[0] - AAA];\r
if(promoted) piece = (ChessSquare) (DEMOTED piece);\r
- if (ToLower(yytext[skip3]) != ToLower(PieceToChar(piece)))\r
+ c = PieceToChar(piece);\r
+ if(c == '~') c = PieceToChar((ChessSquare) (DEMOTED piece));\r
+ if (ToLower(yytext[skip3]) != ToLower(c))\r
return (int) IllegalMove;\r
\r
result = LegalityTest(boards[yyboardindex],\r
return (int) result;\r
}\r
\r
-[a-l][0-9][xX:-]?[a-l][0-9]((=?\(?[A-Z]\)?)|=)? {\r
+[a-l][0-9][xX:-]?[a-l][0-9]((=?\(?[A-Za-z]\)?)|=)? {\r
/*\r
* Simple algebraic move, possibly with promotion\r
+ * [HGM] Engine moves are received in this format, with lower-case promoChar!\r
*/\r
int skip = 0;\r
ChessMove result;\r
+Winboard_F.4.3.12 release notes\r
+\r
+This WinBoard (beta-)version is derived from Allessandro Scotti's Winboard_x, and supports the following new options, mainly in the area of adjudication of engine-engine games, improved Crazyhouse support, and allowing variants with non-conventional pieces and or board sizes. (All option are shown here with their default values):\r
+\r
+/variant=normal \r
+This (already existing) option has been expanded with several new variants, involving non-conventional pieces and deviating board sizes. The board size is automatically adapted to the selected variant, unless explicitly overruled (see below). The new variants are (with default board size, files x ranks, in parentheses): \r
+\r
+variant name Game board description\r
+knightmate Knightmate (8x8) Variant where the King moves as a Knight, and vice versa \r
+capablanca Capablanca Chess (10x8) Variant featuring Archbishop and Chancellor as new pieces \r
+gothic Gothic Chess (10x8) Same as Capablanca, with a more interesting opening position \r
+courier Courier Chess (12x8) a Medieval form that combines elements of Shatranj and modern Chess \r
+shogi Shogi (9x9) Japanese Chess \r
+xiangqi Xiangqi (9x10) Chinese Chess \r
+fairy Fairy Chess (8x8) Variant were you can use all pieces of other variants together \r
+ \r
+The variant can be set from the newly added "File -> New Variant..." sub-menu. \r
+Extra board files are indicated by the letters i, j, k, l, ... For boards with more than 9 ranks, the counting starts at zero! More than 10 ranks is not tested and unlikely to work in the area of PGN saving / reading. Non-FIDE pieces will be referred to in FENs and PGN by letters that depend on the variant, and might collide with piece designators in other variants. E.g. in Xiangqi 'C' is a Cannon, in Capablanca Chess it is a Chancellor. Pieces that do not belong in a variant cannot be addressed in FEN and PGN either, for as long as that variant is selected, unless the letter assignment is overruled with the aid of the /pieceToCharTable option. The variant is not saved in the winboard.ini file; on start-up we always get variant "normal" unless we use the command-line option, or have added the option to the winboard.ini file manually (in which case it will disappear when this file is overwritten by WinBoard saving its options). \r
+WinBoard_F knows the movement of all pieces occurring in Capablanca Chess (of which FIDE Chess is a subset), Shatranj, Courier, Xiangqi and 9x9 Shogi, so that these games can be played with legality testing enabled. \r
+\r
+/pieceToCharTable="PNBRQFWEMOUHACGSKpnbrqfwemouhacgsk" \r
+Each piece that WinBoard knows (in its legality test) has a letter associated with it, by which it will be referred to in FEN or PGN. The default assignment can be overruled with this option. The value has to be a string of even length, with at least 12 characters. The first half of the string designates the white pieces, the second half the black. \r
+The last letter for each color will be assigned to the King. (This is the piece that moves as an orthodox King; note that Nightmate and Xiangqi have a different royal piece.) All letters before it will be assigned to the other pieces in the order: \r
+\r
+P Pawn (move often depends on variant) \r
+N Knight (move subtly different in Xiangqi (where it is written as H) or Shogi) \r
+B Bishop \r
+R Rook \r
+Q Queen (Lance L in Shogi) \r
+F Ferz/General (The Shatranj 'Queen' and Xiangqi 'Adviser', used for Silver General S in Shogi.) \r
+W Wazir/GrandVizer (Gold General G in Shogi, in Xiangqi it is royal and denoted by K) \r
+E Alfil/Elephant (Moves subtly different in Xiangqi vs Shatranj/Courier) \r
+M Commoner/Man\r
+O Cannon/Pao \r
+U Unicorn (representation of Royal Knight in Knightmate, used as promoted Pawn in Shogi) \r
+H Nightrider (Promoted Knight in Shogi and CrazyHouse) \r
+A Archbishop/Cardinal (Promoted Bishop in Shogi and CrazyHouse) \r
+C Chancellor/Marshall (Promoted Rook in Shogi and CrazyHouse) \r
+G Grasshopper (Promoted Queen in Crazyhouse, promoted Lance in Shogi) \r
+S (Promoted Silver in Shogi) \r
+K King \r
+ \r
+Pieces that are not mentioned (because the argument has less than 34 characters) will remain disabled. Mentioned pieces can be disabled by assigning them a '.' (period). They are then not recognized in FEN or PGN input. Non-FIDE pieces that are not assigned a letter will also not appear on the promotion menu. It is not advisable to disable a piece that is present in the opening position of the selected variant, though. \r
+Promoted pieces that need to be distinguished from original pieces of the same type (because of demotion on capture and transfer to the holdings) will be indicated by the letter for the unpromoted piece with a '+' in front of it (Shogi), or by the letter of the promoted piece with a '~' after it (Crazyhouse, Bughouse, in general everything with holdings that is not Shogi). To achieve this, they should be assigned the characters '+' or '~', respectively.\r
+All the new pieces have a native bitmap representation in the board sizes 'bulky' and 'middling'. For all window sizes that do not support such fairy bitmaps, promoted NBRQ are represented as a 2-sizes-smaller normal piece symbol, so that Crazyhouse can be played at any size. People disliking the fairy representations might even prefer this. \r
+There is an enhanced 'Edit Position' menu popup (right-clicking on the squares after selecting this mode in the main menu), featuring some common non-FIDE pieces, and 'promote' and 'demote' options to make those not directly in the menu. The promotion popup shows ArchBishop and Chancellor in Capablanca and Gothic, (or in fact in any game where this piece is not disabled or a promoted version of a normal piece), and leaves only the options YES / NO in Shogi. In Xiangqi there are no promotions.\r
+\r
+/fontPieceToCharTable="PNBRQFWEMOUHACGSKpnbrqfwemouhacgsk" \r
+This option is similar to /pieceToCharTable, but sets the font character that is used to display the piece on the screen (when font-based rendering is in use), rather than in the FEN or PGN. The default setting should work with George Tsavdaris' WinboardF font, which uses the 'intuitive' mapping of font characters to symbols. With font-based rendering the fairy pieces can be used at any board size.\r
+Note that UHACGS are also used to represent the promoted versions of PNBRQF, in games like Crazyhouse and Shogi, where the promotion has to be undone on capture. In such games you are likely to prefer a different representation of those pieces then when they represent true fairy pieces.\r
+\r
+/boardWidth=-1 /boardHeight=-1 \r
+Set a number of files and ranks of the playing board to a value that will override the defaults for the variant that is selected. A value of -1 means the variant default board size will be used for the corresponding parameter (and is itself the default value of these options). These parameters can be set in the "Files -> New Variant..." sub-menu, where they are reset to the default -1 if you OK the chosen variant without typing something to overrule it. These parameters are saved in the winboard.ini file. (But unless you saved while a variant with board-size override was selected, they will always be saved as -1.) \r
+A variant with a non-standard board size will be communicated to the engine(s) with the board size prefixed to the variant name, e.g. "variant 12x8_capablanca". In protocol 2 the engine must first enable this feature by sending "boardsizeFxR" amongst the accepted variants, where F is the maximum number of files, and R the maximum number of ranks, as decimal numbers. \r
+\r
+/holdingsSize=-1 \r
+Set the size of the holdings for dropable pieces to a value that will override the default for the variant that is selected. A value of -1 means the variant default holdings size will be used for that parameter (and is itself the default value of this options). This parameter can be set in the Files -> New Variant... sub-menu, where it is reset to the default -1 if you OK the chosen variant without typing something to overrule it. This parameters is saved in the winboard.ini file. \r
+To disable holdings, set their size to 0. They will then not be displayed. For non-zero holding size N, the holdings are displayed left and right of the board, and piece drops can be effected by dragging pieces from the holdings to the drop square. In bughouse, the holdings will be filled by the ICS. In all other variants, captured pieces will go into the holdings (after reversing their color). Only the first N pieces of the /pieceToCharTable argument will go into the holdings. All other pieces will be converted to Pawns. (In Shogi, however they will be demoted in the regular way before determining if they fit.) Pieces that are disabled (per default and per /pieceToCharTable option) might not be counted when determining what are the first N pieces. \r
+Non-standard holdingsize will be communicated to the engine by prefixing it (together with the board size, even if this is standard) to the variant name, e.g. "variant 7x7+5_shogi". In protocol 2 the engine should enable this feature by sending "holdingsH" amongst the variant names, where H is the maximum acceptable holdings size as a decimal number. \r
+\r
+/alphaRank=FALSE \r
+When this parameter is true, a-h are converted to 1-9, and vice versa, in all move output and input (to PGN files or SAN move display as well as in communication with the engine). This might be useful for Shogi, where conventionally one uses letters to designate ranks, and digits to designate files. Engines that want to use this option must make sure pieces are never represented by lower case! This option can be set from the Files -> New Variant... menu, where it defaults to FALSE unless you explicitly set it. It is not saved in the winboard.ini file. \r
+This kludge does not seem to work for reading PGN files. Saving works fine. For now, using it is not recommended. In the future it might be redefined as only affecting engine-engine communication, .\r
+Note that the PGN format in Shogi also leaves out the trailing '+' as check indicator: In Shogi such a trailing '+' means promotion, while a trailing '=' means defer promotion. Prefix '+' signs are used on moves with promoted pieces, disambiguation is done western SAN style.\r
+\r
+/allWhite=FALSE\r
+Causes the outline of the 'white' pieces to be superimposed onto the 'black' piece symbols as well (as a black outline) when native bitmaps are used (as opposed to font-based rendering). This is useful if we choose a very light color to represent the 'black' pieces. It might be particularly useful in Shogi, where the conventional representation of the 'black' pieces is as upside-down white pieces, so that both colors would be white. This option is saved in the winboard.ini file, and can be set in the "Options -> Board..." sub-menu. \r
+\r
+/flipBlack=FALSE\r
+Setting this option will cause upside-down display of the native piece bitmaps used to represent the pieces of the side that plays black, as would be needed for a traditional representation of Shogi pieces. It can be set from the "Options -> Board..." sub-menu, and it is saved in the winboard.ini file. For now, traditional Shogi bitmaps are only included for size "moderate". For other sizes you must depend on font-based rendering.\r
+\r
+/detectMate=TRUE \r
+/testClaim=TRUE \r
+/materialDraws=TRUE \r
+/trivialDraws=FALSE \r
+/ruleMoves=51 \r
+/repeatsToDraw=6 \r
+These are all options that only affect engine-engine play, and can be set from the "Options -> Engine..." sub-menu. They are all related to adjudication of games by the GUI. Legality checking must be switched on for them to work. \r
+If /detectMate is TRUE, the GUI recognizes checkmate and stalemate (but not in games with holdings!), and ends the game accordingly before the engines can claim. This is convenient for play with engines that fail to claim, and just exit. \r
+With /testClaim set, all result and illegal-move claims by engines that claim more than their own loss are scrutinized for validity, and false claims result in forfeit of the game. Useful with buggy engines. \r
+The option /materialDraws=TRUE causes games with insufficient mating material to be adjudicated immediately as draws, in case the engines would not claim these draws. This applies to KK, KNK and KBK.\r
+The option /trivialDraws adjudicates KNNK, KBKB, KNKN, KBKN, KRKR and KQKQ to draws after 3 moves (to allow for a quick tactical win). Note that in KQKQ this might not be sound, but that problem would disappear once bitbase probing is implemented. \r
+The /ruleMoves determine after how many reversible moves the game is adjudicated as a draw. Setting this to 0 turns this option off. Draw claims by the engine are still accepted (with /testClaim=TRUE) after 50 reversible moves, even if /ruleMoves species a larger number. Note that it is perfectly legal according to FIDE rules to play on after 50 reversible moves, but in tournaments having two engines that want to play on forever is a nuisance in endings like KBNKR, where one of the engines thinks it is ahead and can avoids repeats virtually forever. \r
+The option /repeatsToDraw makes the GUI adjudicate a game as draw after the same position has occurred the specified number of times. If it is set to a value > 3, engines can still claim the draw after 3-fold repeat. \r
+All these options are saved in the winboard.ini file. \r
+\r
+/matchPause=10000 \r
+Determines the number of milliseconds that is paused between two games of a match. In the old WinBoard this was always 10 sec, which was inconveniently long in fast games. If you make the pause too short, tardy engines might get into trouble, though. Saved in the Winboard.ini.\r
+\r
+Clocks\r
+There is an "Options -> swap clocks" command, that swaps the position of white and black clocks (convenient in over-the-board matches, where the display is standing next to the board, and you want your own time to be displayed on your side of the screen). The clocks can be adjusted in "edit game" mode: right-clicking them adds one minute, left-clicking subtracts one minute. (Also for OTB matches, to keep them synchronized with the official match clock.) The flag-fell condition is now indicated as '(!)' behind the displayed time, to eliminate the necessity for overwriting the message in the title bar (which might contain indispensible information in match mode).\r
+\r
+Other improvements / changes\r
+Castling rights and e.p. rights are now fully maintained, and considered in legality testing. They are imported from and written to FEN, as is the 50-move counter. (When reading an incomplete FEN they are still guessed, though.) \r
+The time (in sec, or min:sec) is now always stored together with the PV information to the PGN, if storing the latter was requested (through ticking "extended PGN info" in "Options -> General..."). The saved time is the WinBoard clock time (as opposed to the time reported by the engine).\r
+\r
+----------------------------------------------------------------\r
Winboard_F.4.3.8 release notes\r
\r
This Winboard supports the following new options (shown here with their default values):\r
{ "holdingsSize", ArgInt, (LPVOID) &appData.holdingsSize, TRUE },\r
{ "matchPause", ArgInt, (LPVOID) &appData.matchPause, TRUE },\r
{ "pieceToCharTable", ArgString, (LPVOID) &appData.pieceToCharTable, FALSE },\r
- { "flipBlack", ArgBoolean, (LPVOID) &appData.allWhite, TRUE },\r
+ { "flipBlack", ArgBoolean, (LPVOID) &appData.upsideDown, TRUE },\r
{ "allWhite", ArgBoolean, (LPVOID) &appData.allWhite, TRUE },\r
{ "alphaRank", ArgBoolean, (LPVOID) &appData.alphaRank, FALSE },\r
{ "testClaims", ArgBoolean, (LPVOID) &appData.testClaims, TRUE },\r
pieceBitmap[1][WhiteGrasshopper] = DoLoadBitmap(hInst, "q", minorSize, "o");\r
pieceBitmap[2][WhiteGrasshopper] = DoLoadBitmap(hInst, "q", minorSize, "w");\r
}\r
+ if(gameInfo.variant == VariantShogi && squareSize == 58)\r
+ /* special Shogi support in this size */\r
+ { for (i=0; i<=2; i++) { /* replace all bitmaps */\r
+ for (piece = WhitePawn;\r
+ (int) piece < (int) BlackPawn;\r
+ piece = (ChessSquare) ((int) piece + 1)) {\r
+ if (pieceBitmap[i][piece] != NULL)\r
+ DeleteObject(pieceBitmap[i][piece]);\r
+ }\r
+ }\r
+ pieceBitmap[0][WhitePawn] = DoLoadBitmap(hInst, "sp", squareSize, "o");\r
+ pieceBitmap[0][WhiteKnight] = DoLoadBitmap(hInst, "sn", squareSize, "o");\r
+ pieceBitmap[0][WhiteBishop] = DoLoadBitmap(hInst, "sb", squareSize, "o");\r
+ pieceBitmap[0][WhiteRook] = DoLoadBitmap(hInst, "sr", squareSize, "o");\r
+ pieceBitmap[0][WhiteQueen] = DoLoadBitmap(hInst, "sl", squareSize, "o");\r
+ pieceBitmap[0][WhiteKing] = DoLoadBitmap(hInst, "sk", squareSize, "o");\r
+ pieceBitmap[0][WhiteFerz] = DoLoadBitmap(hInst, "sf", squareSize, "o");\r
+ pieceBitmap[0][WhiteWazir] = DoLoadBitmap(hInst, "sw", squareSize, "o");\r
+ pieceBitmap[0][WhiteUnicorn] = DoLoadBitmap(hInst, "su", squareSize, "o");\r
+ pieceBitmap[0][WhiteNightrider] = DoLoadBitmap(hInst, "sh", squareSize, "o");\r
+ pieceBitmap[0][WhiteCardinal] = DoLoadBitmap(hInst, "sa", squareSize, "o");\r
+ pieceBitmap[0][WhiteMarshall] = DoLoadBitmap(hInst, "sc", squareSize, "o");\r
+ pieceBitmap[0][WhiteGrasshopper] = DoLoadBitmap(hInst, "sg", squareSize, "o");\r
+ pieceBitmap[0][WhiteSilver] = DoLoadBitmap(hInst, "ss", squareSize, "o");\r
+ pieceBitmap[1][WhitePawn] = DoLoadBitmap(hInst, "sp", squareSize, "o");\r
+ pieceBitmap[1][WhiteKnight] = DoLoadBitmap(hInst, "sn", squareSize, "o");\r
+ pieceBitmap[1][WhiteBishop] = DoLoadBitmap(hInst, "sb", squareSize, "o");\r
+ pieceBitmap[1][WhiteRook] = DoLoadBitmap(hInst, "sr", squareSize, "o");\r
+ pieceBitmap[1][WhiteQueen] = DoLoadBitmap(hInst, "sl", squareSize, "o");\r
+ pieceBitmap[1][WhiteKing] = DoLoadBitmap(hInst, "sk", squareSize, "o");\r
+ pieceBitmap[1][WhiteFerz] = DoLoadBitmap(hInst, "sf", squareSize, "o");\r
+ pieceBitmap[1][WhiteWazir] = DoLoadBitmap(hInst, "sw", squareSize, "o");\r
+ pieceBitmap[1][WhiteUnicorn] = DoLoadBitmap(hInst, "su", squareSize, "o");\r
+ pieceBitmap[1][WhiteNightrider] = DoLoadBitmap(hInst, "sh", squareSize, "o");\r
+ pieceBitmap[1][WhiteCardinal] = DoLoadBitmap(hInst, "sa", squareSize, "o");\r
+ pieceBitmap[1][WhiteMarshall] = DoLoadBitmap(hInst, "sc", squareSize, "o");\r
+ pieceBitmap[1][WhiteGrasshopper] = DoLoadBitmap(hInst, "sg", squareSize, "o");\r
+ pieceBitmap[1][WhiteSilver] = DoLoadBitmap(hInst, "ss", squareSize, "o");\r
+ pieceBitmap[2][WhitePawn] = DoLoadBitmap(hInst, "sp", squareSize, "w");\r
+ pieceBitmap[2][WhiteKnight] = DoLoadBitmap(hInst, "sn", squareSize, "w");\r
+ pieceBitmap[2][WhiteBishop] = DoLoadBitmap(hInst, "sr", squareSize, "w");\r
+ pieceBitmap[2][WhiteRook] = DoLoadBitmap(hInst, "sr", squareSize, "w");\r
+ pieceBitmap[2][WhiteQueen] = DoLoadBitmap(hInst, "sl", squareSize, "w");\r
+ pieceBitmap[2][WhiteKing] = DoLoadBitmap(hInst, "sk", squareSize, "w");\r
+ pieceBitmap[2][WhiteFerz] = DoLoadBitmap(hInst, "sw", squareSize, "w");\r
+ pieceBitmap[2][WhiteWazir] = DoLoadBitmap(hInst, "sw", squareSize, "w");\r
+ pieceBitmap[2][WhiteUnicorn] = DoLoadBitmap(hInst, "sp", squareSize, "w");\r
+ pieceBitmap[2][WhiteNightrider] = DoLoadBitmap(hInst, "sn", squareSize, "w");\r
+ pieceBitmap[2][WhiteCardinal] = DoLoadBitmap(hInst, "sr", squareSize, "w");\r
+ pieceBitmap[2][WhiteMarshall] = DoLoadBitmap(hInst, "sr", squareSize, "w");\r
+ pieceBitmap[2][WhiteGrasshopper] = DoLoadBitmap(hInst, "sl", squareSize, "w");\r
+ pieceBitmap[2][WhiteSilver] = DoLoadBitmap(hInst, "sw", squareSize, "w");\r
+ minorSize = 0;\r
+ }\r
}\r
\r
HBITMAP\r
oldFont = SelectObject(hdc, font[boardSize][COORD_FONT]->hf);\r
\r
y = boardRect.top + lineGap;\r
- x = boardRect.left + lineGap;\r
+ x = boardRect.left + lineGap + gameInfo.holdingsWidth*(squareSize + lineGap);\r
\r
SetTextAlign(hdc, TA_LEFT|TA_TOP);\r
for (i = 0; i < BOARD_HEIGHT; i++) {\r
start = flipView ? 12-BOARD_WIDTH : 12;\r
\r
SetTextAlign(hdc, TA_RIGHT|TA_BOTTOM);\r
- for (i = 0; i < BOARD_WIDTH; i++) {\r
+ for (i = 0; i < BOARD_RGHT - BOARD_LEFT; i++) {\r
str[0] = ranks[start + i];\r
ExtTextOut(hdc, x + squareSize - 2, y - 1, 0, NULL, str, 1, NULL);\r
x += squareSize + lineGap;\r
oldBrush = SelectObject(hdc, whitePieceBrush);\r
else oldBrush = SelectObject(hdc, blackPieceBrush);\r
if(appData.upsideDown && !color)\r
- StretchBlt(hdc, x, y+tmpSize, tmpSize, -tmpSize, tmphdc, 0, 0, tmpSize, tmpSize, 0x00B8074A);\r
+ StretchBlt(hdc, x+tmpSize, y+tmpSize, -tmpSize, -tmpSize, tmphdc, 0, 0, tmpSize, tmpSize, 0x00B8074A);\r
else\r
BitBlt(hdc, x, y, tmpSize, tmpSize, tmphdc, 0, 0, 0x00B8074A);\r
#if 0\r
/* Use black for outline of white pieces */\r
SelectObject(tmphdc, PieceBitmap(piece, OUTLINE_PIECE));\r
if(appData.upsideDown && !color)\r
- StretchBlt(hdc, x, y+tmpSize, tmpSize, -tmpSize, tmphdc, 0, 0, tmpSize, tmpSize, SRCAND);\r
+ StretchBlt(hdc, x+tmpSize, y+tmpSize, -tmpSize, -tmpSize, tmphdc, 0, 0, tmpSize, tmpSize, SRCAND);\r
else\r
BitBlt(hdc, x, y, tmpSize, tmpSize, tmphdc, 0, 0, SRCAND);\r
#endif\r
oldBitmap = SelectObject(tmphdc, PieceBitmap(piece, SOLID_PIECE));\r
oldBrush = SelectObject(hdc, blackPieceBrush);\r
if(appData.upsideDown)\r
- StretchBlt(hdc, x, y+tmpSize, tmpSize, -tmpSize, tmphdc, 0, 0, tmpSize, tmpSize, 0x00B8074A);\r
+ StretchBlt(hdc, x+tmpSize, y+tmpSize, -tmpSize, -tmpSize, tmphdc, 0, 0, tmpSize, tmpSize, 0x00B8074A);\r
else\r
BitBlt(hdc, x, y, tmpSize, tmpSize, tmphdc, 0, 0, 0x00B8074A);\r
#endif\r
DrawPosition(forceFullRepaint || FALSE, NULL);\r
}\r
}\r
+ break;\r
+ }\r
+ if (gotPremove) {\r
+ /* [HGM] it seemed that braces were missing here */\r
+ SetPremoveHighlights(fromX, fromY, toX, toY);\r
+ fromX = fromY = -1;\r
+ break;\r
}\r
- if (gotPremove) SetPremoveHighlights(fromX, fromY, toX, toY);\r
- fromX = fromY = -1;\r
- break;\r
}\r
ClearHighlights();\r
DrawPosition(forceFullRepaint || FALSE, NULL);\r
ReleaseCapture();\r
if (fromX == -1) break;\r
if (x == fromX && y == fromY) {\r
+ dragInfo.from.x = dragInfo.from.y = -1;\r
/* Upclick on same square */\r
if (sameAgain) {\r
/* Clicked same square twice: abort click-click move */\r
/* First square clicked: start click-click move */\r
SetHighlights(fromX, fromY, -1, -1);\r
}\r
- dragInfo.from.x = dragInfo.from.y = -1;\r
DrawPosition(forceFullRepaint || FALSE, NULL);\r
} else if (dragInfo.from.x < 0 || dragInfo.from.y < 0) {\r
/* Errant click; ignore */\r
SW_SHOW : SW_HIDE);\r
/* [HGM] Only allow C & A promotions if these pieces are defined */\r
ShowWindow(GetDlgItem(hDlg, PB_Archbishop),\r
- (PieceToChar(WhiteCardinal) != '.' ||\r
- PieceToChar(BlackCardinal) != '.' ) ?\r
+ (PieceToChar(WhiteCardinal) >= 'A' &&\r
+ PieceToChar(WhiteCardinal) != '~' ||\r
+ PieceToChar(BlackCardinal) >= 'A' &&\r
+ PieceToChar(BlackCardinal) != '~' ) ?\r
SW_SHOW : SW_HIDE);\r
ShowWindow(GetDlgItem(hDlg, PB_Chancellor), \r
- (PieceToChar(WhiteMarshall) != '.' ||\r
- PieceToChar(BlackMarshall) != '.' ) ?\r
+ (PieceToChar(WhiteMarshall) >= 'A' &&\r
+ PieceToChar(WhiteMarshall) != '~' ||\r
+ PieceToChar(BlackMarshall) >= 'A' &&\r
+ PieceToChar(BlackMarshall) != '~' ) ?\r
SW_SHOW : SW_HIDE);\r
/* [HGM] Hide B & R button in Shogi, use Q as promote, N as defer */\r
ShowWindow(GetDlgItem(hDlg, PB_Rook),\r
POPUP "&Options"\r
BEGIN\r
MENUITEM "Flip &View\tF2", IDM_FlipView\r
- MENUITEM "Flip &Clocks", IDM_FlipClock\r
+ MENUITEM "Swap &Clocks", IDM_FlipClock\r
MENUITEM SEPARATOR\r
MENUITEM "&General...", IDM_GeneralOptions\r
MENUITEM "&Board...", IDM_BoardOptions\r
L49W BITMAP MOVEABLE PURE "bitmaps\\l49w.bmp"\r
DK49W BITMAP MOVEABLE PURE "bitmaps\\dk49w.bmp"\r
\r
+SP58O BITMAP MOVEABLE PURE "shogibitmaps\\sp58o.bmp"\r
+SN58O BITMAP MOVEABLE PURE "shogibitmaps\\sn58o.bmp"\r
+SB58O BITMAP MOVEABLE PURE "shogibitmaps\\sb58o.bmp"\r
+SR58O BITMAP MOVEABLE PURE "shogibitmaps\\sr58o.bmp"\r
+SL58O BITMAP MOVEABLE PURE "shogibitmaps\\sl58o.bmp"\r
+SK58O BITMAP MOVEABLE PURE "shogibitmaps\\sk58o.bmp"\r
+SF58O BITMAP MOVEABLE PURE "shogibitmaps\\sf58o.bmp"\r
+SW58O BITMAP MOVEABLE PURE "shogibitmaps\\sw58o.bmp"\r
+SU58O BITMAP MOVEABLE PURE "shogibitmaps\\su58o.bmp"\r
+SH58O BITMAP MOVEABLE PURE "shogibitmaps\\sh58o.bmp"\r
+SA58O BITMAP MOVEABLE PURE "shogibitmaps\\sa58o.bmp"\r
+SC58O BITMAP MOVEABLE PURE "shogibitmaps\\sc58o.bmp"\r
+SG58O BITMAP MOVEABLE PURE "shogibitmaps\\sg58o.bmp"\r
+SS58O BITMAP MOVEABLE PURE "shogibitmaps\\ss58o.bmp"\r
+SP58W BITMAP MOVEABLE PURE "shogibitmaps\\sp58w.bmp"\r
+SN58W BITMAP MOVEABLE PURE "shogibitmaps\\sn58w.bmp"\r
+SR58W BITMAP MOVEABLE PURE "shogibitmaps\\sr58w.bmp"\r
+SL58W BITMAP MOVEABLE PURE "shogibitmaps\\sl58w.bmp"\r
+SK58W BITMAP MOVEABLE PURE "shogibitmaps\\sk58w.bmp"\r
+SW58W BITMAP MOVEABLE PURE "shogibitmaps\\sw58w.bmp"\r
+\r
\r
#ifdef APSTUDIO_INVOKED\r
/////////////////////////////////////////////////////////////////////////////\r
hsc = ParseColorName(HIGHLIGHT_SQUARE_COLOR);\r
phc = ParseColorName(PREMOVE_HIGHLIGHT_COLOR);\r
mono = FALSE;\r
+ white= FALSE;\r
+ flip = FALSE;\r
CheckDlgButton(hDlg, OPT_Monochrome, FALSE);\r
+ CheckDlgButton(hDlg, OPT_AllWhite, FALSE);\r
+ CheckDlgButton(hDlg, OPT_UpsideDown, FALSE);\r
PaintColorBlock(hDlg, OPT_LightSquareColor, lsc);\r
PaintColorBlock(hDlg, OPT_DarkSquareColor, dsc);\r
PaintColorBlock(hDlg, OPT_WhitePieceColor, wpc);\r
projects / xboard.git / commitdiff
