Use setup command in Sho Shogi

To exploit the new engine-defined-variants mechanism of XBoard,
a duplicate of Sho Shogi is added with an engine-defined name.
The length of the variant table is now determined dynamically,
by using the sentinel, and the variants feature is now generated from
this table (rather than hard-coded). The variant 12x12+0_fairy has
been dropped as alternative for Chu Shogi, as this never really worked,
and chu has been elevated to standard variant in the XBoard main branch.

diff --git a/hachu.c b/hachu.c
index 084aa01..ce8ccc4 100644 (file)
--- a/hachu.c
+++ b/hachu.c
@@ -432,11 +432,12 @@ typedef struct {
   char *array; // initial position\r
 } VariantDesc;\r
 \r
-typedef enum { V_CHESS, V_SHO, V_CHU, V_DAI, V_TENJIKU, V_DADA, V_MAKA, V_TAI, V_KYOKU, V_SHATRANJ, V_MAKRUK, V_LION, V_NUMBER } 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
 VariantDesc variants[] = {\r
   { 16,  8,  8, 1, V_CHESS,  "normal", 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
@@ -444,7 +445,7 @@ VariantDesc variants[] = {
   { 16,  8,  8, 3, V_MAKRUK,  "makruk",  thaiArray}, // Makruk\r
   { 16,  8,  8, 1, V_LION,    "lion",    lionArray}, // Mighty Lion\r
 \r
-//  { 0, 0, 0, 0, 0 }, // sentinel\r
+  { 0, 0, 0, 0, 0 }, // sentinel\r
   { 34, 17, 17, 0, V_DADA,    "dada",    chuArray }, // Dai Dai\r
   { 38, 19, 19, 0, V_MAKA,    "maka",    chuArray }, // Maka Dai Dai\r
   { 50, 25, 25, 0, V_TAI,     "tai",     chuArray }, // Tai\r
@@ -2612,8 +2613,9 @@ pboard(board);
           continue;\r
         }\r
         if(!strcmp(command, "protover")){\r
+          for(i=0; variants[i].boardWidth; i++)\r
+          printf("%s%s", (i ? "," : "feature variants=\""), variants[i].name); printf("\"\n");\r
           printf("feature ping=1 setboard=1 colors=0 usermove=1 memory=1 debug=1 sigint=0 sigterm=0\n");\r
-          printf("feature variants=\"normal,shatranj,makruk,chu,dai,tenjiku,12x12+0_fairy,9x9+0_shogi,lion\"\n");\r
           printf("feature myname=\"HaChu " VERSION "\" highlight=1\n");\r
           printf("feature option=\"Full analysis PV -check 1\"\n"); // example of an engine-defined option\r
           printf("feature option=\"Allow repeats -check 0\"\n");\r
@@ -2687,12 +2689,14 @@ pboard(board);
           continue;\r
         }\r
         if(!strcmp(command, "variant")) {\r
-          for(i=0; i<8; i++) {\r
+          for(i=0; variants[i].boardWidth; i++) {\r
             sscanf(inBuf+8, "%s", command);\r
             if(!strcmp(variants[i].name, command)) {\r
               Init(curVarNr = i); stm = Setup2(NULL); break;\r
             }\r
          }\r
+          if(currentVariant == V_SHO)\r
+            printf("setup (PNBRLSE..G.+++++++Kpnbrlse..g.+++++++k) 9x9+0_shogi lnsgkgsnl/1r2e2b1/ppppppppp/9/9/9/PPPPPPPPP/1B2E2R1/LNSGKGSNL w 0 1\n");\r
          repStack[199] = hashKeyH, checkStack[199] = 0;\r
           continue;\r
         }\r