X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=hachu.c;h=6b8f54240ce185722d49240d9fe50c52cf7760a3;hb=3b48f19d9f6f6d04c0ebd02c08ed5c98df98b85e;hp=ad2904e2c4e239147f738e8975b33b2c57e5d918;hpb=fbdf26b9d971d08e990b906d65e27bc463571212;p=hachu.git

diff --git a/hachu.c b/hachu.c
index ad2904e..6b8f542 100644
--- a/hachu.c
+++ b/hachu.c
@@ -11,7 +11,7 @@
 // promotions by pieces with Lion power stepping in & out the zone in same turn
 // promotion on capture
 
-#define VERSION "0.1beta"
+#define VERSION "0.4beta"
 
 #define PATH level==0 || path[0] == 0xc4028 &&  (level==1 /*|| path[1] == 0x75967 && (level == 2 || path[2] == 0x3400b && (level == 3))*/)
 //define PATH 0
@@ -691,6 +691,7 @@ SetUp(char *array, int var)
 	if(name[1]) name[1] += 'A' - 'a';
       } else color = WHITE;
       p1 = LookUp(name, var);
+      if(!p1) printf("tellusererror Unknown piece '%s' in setup\n", name), exit(-1);
       if(pflag && p1->promoted) p1 = LookUp(p1->promoted, var); // use promoted piece instead
       n = AddPiece(color, p1);
       p[n].pos = j;
@@ -1822,8 +1823,6 @@ pmoves(int start, int end)
     #define OFF 0
     #define ON  1
 
-#define DEFAULT_FEN ""
-
 typedef Move MOVE;
 
     int moveNr;              // part of game state; incremented by MakeMove
@@ -1891,7 +1890,8 @@ Convert (char *fen)
     if(isalpha(*fen)) {
       char *table = fenNames;
       n = *fen > 'Z' ? 'a' - 'A' : 0;
-      if(table[2* (*fen - 'A' - n)] == '.') *p++ = *fen; else {
+      if(currentVariant == V_CHESS && *fen - 'A' - n == 'N' // In Chess N is Knight, not Lion
+           || table[2* (*fen - 'A' - n)] == '.') *p++ = *fen; else {
         *p++ = ':';
         *p++ = table[2* (*fen - 'A' - n)] + n;
         *p++ = table[2* (*fen - 'A' - n)+1] + n;
@@ -1990,6 +1990,7 @@ MapFromScratch(attacks);
     if((moveStack[i] & (PROMOTE | DEFER-1)) == ret) break;
     if((moveStack[i] & DEFER-1) == ret) deferred = i; // promoted version of entered non-promotion is legal
   }
+printf("# moveNr = %d in {%d,%d}\n", i, retFirst, retMSP);
   if(i>=retMSP) {  // no exact match
     if(deferred) { // but maybe non-sensical deferral
       int flags = p[board[f]].promoFlag;
@@ -2101,7 +2102,7 @@ PonderUntilInput (int stm)
     int TakeBack(int n)
     { // reset the game and then replay it to the desired point
       int last, stm;
-      stm = Setup2(NULL);
+      Init(currentVariant); stm = Setup2(NULL);
 printf("# setup done");fflush(stdout);
       last = moveNr - n; if(last < 0) last = 0;
       for(moveNr=0; moveNr<last; moveNr++) stm = MakeMove2(stm, gameMove[moveNr]),printf("make %2d: %x\n", moveNr, gameMove[moveNr]);
@@ -2134,6 +2135,7 @@ printf("# setup done");fflush(stdout);
 
         if(stm == engineSide) {         // if it is the engine's turn to move, set it thinking, and let it move
      
+pboard(board);
           score = SearchBestMove(stm, timeLeft, mps, timeControl, inc, timePerMove, &move, &ponderMove);
 
           if(move == INVALID) {         // game apparently ended
@@ -2180,8 +2182,6 @@ printf("# setup done");fflush(stdout);
         // wait for input, and read it until we have collected a complete line
         for(i = 0; (inBuf[i] = getchar()) != '\n'; i++);
         inBuf[i+1] = 0;
-pboard(board);
-pmoves(retFirst, retMSP);
 
         // extract the first word
         sscanf(inBuf, "%s", command);
@@ -2219,7 +2219,6 @@ printf("in: %s\n", command);
           for(i=0; i<5; i++) {
             sscanf(inBuf+8, "%s", command);
             if(!strcmp(variants[i].name, command)) {
-printf("var %d\n",i);
               Init(i); stm = Setup2(NULL); break;
             }
 	  }
@@ -2231,10 +2230,10 @@ printf("var %d\n",i);
         if(!strcmp(command, "ping"))    { printf("pong%s", inBuf+4); continue; }
     //  if(!strcmp(command, ""))        { sscanf(inBuf, " %d", &); continue; }
         if(!strcmp(command, "new"))     {
-          engineSide = BLACK; Init(V_CHESS); stm = Setup2(DEFAULT_FEN); maxDepth = MAXPLY; randomize = OFF; comp = 0;
+          engineSide = BLACK; Init(V_CHESS); stm = Setup2(NULL); maxDepth = MAXPLY; randomize = OFF; comp = 0;
           continue;
         }
-        if(!strcmp(command, "setboard")){ engineSide = NONE;  stm = Setup2(inBuf+9); continue; }
+        if(!strcmp(command, "setboard")){ engineSide = NONE;  Init(currentVariant); stm = Setup2(inBuf+9); continue; }
         if(!strcmp(command, "easy"))    { ponder = OFF; continue; }
         if(!strcmp(command, "hard"))    { ponder = ON;  continue; }
         if(!strcmp(command, "undo"))    { stm = TakeBack(1); continue; }
@@ -2265,6 +2264,7 @@ printf("var %d\n",i);
         if(!strcmp(command, ""))  {  continue; }
         if(!strcmp(command, "usermove")){
           int move = ParseMove(inBuf+9);
+pboard(board);
           if(move == INVALID) {
             if(reason) printf("Illegal move {%s}\n", reason); else printf("%s\n", reason="Illegal move");
             if(comp) PrintResult(stm, -INF); // against computer: claim