char *array; // initial position\r
} VariantDesc;\r
\r
-typedef enum { V_SAME, V_CHESS, V_SHO, V_CHU, V_DAI, V_DADA, V_MAKA, V_TAI, V_KYOKU, V_TENJIKU, V_SHATRANJ, V_MAKRUK, V_LION } Variant;\r
+typedef enum { V_CHESS, V_SHO, V_CHU, V_DAI, V_DADA, V_MAKA, V_TAI, V_KYOKU, V_TENJIKU, V_SHATRANJ, V_MAKRUK, V_LION } Variant;\r
+\r
+#define SAME (-1)\r
\r
VariantDesc variants[] = {\r
- { 16, 8, 8, 1, V_CHESS, "normal", chessArray }, // FIDE\r
+ { 24, 12, 12, 4, V_CHU, "chu", chuArray }, // Chu\r
+ { 16, 8, 8, 1, V_CHESS, "nocastle", chessArray }, // FIDE\r
{ 18, 9, 9, 3, V_SHO, "9x9+0_shogi", shoArray }, // Sho\r
{ 18, 9, 9, 3, V_SHO, "sho", shoArray }, // Sho duplicat\r
- { 24, 12, 12, 4, V_CHU, "chu", chuArray }, // Chu\r
{ 30, 15, 15, 5, V_DAI, "dai", daiArray }, // Dai\r
{ 32, 16, 16, 5, V_TENJIKU, "tenjiku", tenArray }, // Tenjiku\r
{ 16, 8, 8, 1, V_SHATRANJ,"shatranj",shatArray}, // Shatranj\r
int i, j, k;\r
PieceDesc *pawn;\r
\r
- if(var != V_SAME) { // the following should be already set if we stay in same variant (for TakeBack)\r
+ if(var != SAME) { // the following should be already set if we stay in same variant (for TakeBack)\r
currentVariant = variants[var].varNr;\r
bWidth = variants[var].boardWidth;\r
bHeight = variants[var].boardRanks;\r
}\r
} else\r
if(r == M) { // FIDE Pawn; check double-move\r
- if(!NewNonCapture(x, x+v, pFlag) && chessFlag && promoBoard[x-v])\r
+ if(!NewNonCapture(x, x+v, pFlag) && chessFlag && promoBoard[x-v] & LAST_RANK)\r
NewNonCapture(x, x+2*v, pFlag), moveStack[msp-1] |= DEFER; // use promoSuppress flag as e.p. flag\r
}\r
continue;\r
{ // reset the game and then replay it to the desired point\r
int last, stm;\r
last = moveNr - n; if(last < 0) last = 0;\r
- Init(V_SAME); stm = Setup2(startPos);\r
+ Init(SAME); stm = Setup2(startPos);\r
printf("# setup done");fflush(stdout);\r
for(moveNr=0; moveNr<last; moveNr++) stm = MakeMove2(stm, gameMove[moveNr]),printf("make %2d: %x\n", moveNr, gameMove[moveNr]);\r
return stm;\r