Fix undo, remove commands

[hachu.git] / hachu.c

diff --git a/hachu.c b/hachu.c
index e47cf82..f5fd5d2 100644 (file)
--- a/hachu.c
+++ b/hachu.c
@@ -10,7 +10,7 @@
 // promotions by pieces with Lion power stepping in & out the zone in same turn\r
 // promotion on capture\r
 \r
-#define VERSION "0.16 k+ky"\r
+#define VERSION "0.17"\r
 \r
 //define PATH level==0 /*|| path[0] == 0x3490a &&  (level==1 || path[1] == 0x285b3 && (level == 2 || path[2] == 0x8710f && (level == 3 /*|| path[3] == 0x3e865 && (level == 4 || path[4] == 0x4b865 && (level == 5)))))*/\r
 #define PATH 0\r
@@ -71,7 +71,7 @@
 #define BSIZE BWMAX*BHMAX\r
 #define ZONE  zone\r
 \r
-#define ONE (currentVariant == V_SHO || currentVariant == V_CHESS || currentVariant == V_SHATRANJ || currentVariant == V_MAKRUK || currentVariant == V_LION)\r
+#define ONE 1 /* currently no variants with 10-deep board */\r
 \r
 #define BLACK      0\r
 #define WHITE      1\r
@@ -424,7 +424,7 @@ char shoArray[] = "LNSGKGSNL/.B..:DE..R./PPPPPPPPP/........./........./.........
 char chessArray[] = "RNB:FKKBNR/PPPPPPPP/......../......../......../......../pppppppp/rnb:fkkbnr";\r
 char lionArray[]  = "R:LNB:FKKBNR/PPPPPPPP/......../......../......../......../pppppppp/r:lnb:fkkbnr";\r
 char shatArray[]= "RNBK:FKBNR/PPPPPPPP/......../......../......../......../pppppppp/rnbk:fkbnr";\r
-char thaiArray[]= "RNSK:SMSNR/......../PPPPPPPP/......../......../pppppppp/......../rnsk:smsnr";\r
+char thaiArray[]= "RNSK:SMSNR/......../PPPPPPPP/......../......../pppppppp/......../rns:smksnr";\r
 \r
 typedef struct {\r
   int boardWidth, boardFiles, boardRanks, zoneDepth, varNr; // board sizes\r
@@ -432,7 +432,7 @@ typedef struct {
   char *array; // initial position\r
 } VariantDesc;\r
 \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
+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
 \r
 VariantDesc variants[] = {\r
   { 16,  8,  8, 1, V_CHESS,  "normal", chessArray }, // FIDE\r
@@ -890,11 +890,13 @@ Init (int var)
   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
   currentVariant = variants[var].varNr;\r
   bWidth  = variants[var].boardWidth;\r
   bHeight = variants[var].boardRanks;\r
   zone    = variants[var].zoneDepth;\r
   array   = variants[var].array;\r
+  }\r
   bsize = bWidth*bHeight;\r
   chuFlag = (currentVariant == V_CHU || currentVariant == V_LION);\r
   tenFlag = (currentVariant == V_TENJIKU);\r
@@ -2485,7 +2487,7 @@ printf("# ponder=%s\n", MoveToText(pv[1],0));
     { // 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(currentVariant); stm = Setup2(startPos);\r
+      Init(V_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