static char *InPtr;
struct display *dsp = &raw_display;
+short xboard = false;
#if defined(BOOKTEST)
s++;
*s = '*';
s++;
- *s = cxx[column(t)];
+ *s = COL_NAME(column(t));
s++;
- *s = rxx[row(t)];
+ *s = ROW_NAME(row(t));
s++;
}
else
{
- *s = cxx[column(f)];
+ *s = COL_NAME(column(f));
s++;
- *s = rxx[row(f)];
+ *s = ROW_NAME(row(f));
s++;
- *s = cxx[column(t)];
+ *s = COL_NAME(column(t));
s++;
- *s = rxx[row(t)];
+ *s = ROW_NAME(row(t));
s++;
if (flag & promote)
short piece = flag & pmask;
mvstr[0][0] = pxx[piece];
- mvstr[0][1] = '*';
- mvstr[0][2] = cxx[column(t)];
- mvstr[0][3] = rxx[row(t)];
+ mvstr[0][1] = xboard ? '@' : '*';
+ mvstr[0][2] = COL_NAME(column(t));
+ mvstr[0][3] = ROW_NAME(row(t));
mvstr[0][4] = '\0';
strcpy(mvstr[1], mvstr[0]);
strcpy(mvstr[2], mvstr[0]);
else if ((f != 0) || (t != 0))
{
/* pure coordinates notation */
- mvstr[0][0] = cxx[column(f)];
- mvstr[0][1] = rxx[row(f)];
- mvstr[0][2] = cxx[column(t)];
- mvstr[0][3] = rxx[row(t)];
+ mvstr[0][0] = COL_NAME(column(f));
+ mvstr[0][1] = ROW_NAME(row(f));
+ mvstr[0][2] = COL_NAME(column(t));
+ mvstr[0][3] = ROW_NAME(row(t));
mvstr[0][4] = '\0';
/* algebraic notation without disambiguation */
if (SqAttacked(PieceList[opponent][0], computer, &blocked))
{
UnmakeMove(opponent, &xnode, &tempb, &tempc, &tempsf, &tempst);
- dsp->AlwaysShowMessage("Illegal move (in check) %s", s);
+ dsp->AlwaysShowMessage("Illegal move (in check): %s", s);
return false;
}
else
}
}
- dsp->AlwaysShowMessage("Illegal move (no match) %s", s);
+ dsp->AlwaysShowMessage("Illegal move (no match): %s", s);
if (!XSHOGI && (cnt > 1))
{
if (f[1] == '*' || f[1] == '\'')
{
- c2 = COL_NAME(f[2]);
- r2 = ROW_NAME(f[3]);
+ c2 = COL_NUM(f[2]);
+ r2 = ROW_NUM(f[3]);
return ((NO_SQUARES + *fpiece) << 8) | locn(r2, c2);
}
else
{
- c1 = COL_NAME(f[1]);
- r1 = ROW_NAME(f[2]);
- c2 = COL_NAME(f[3]);
- r2 = ROW_NAME(f[4]);
+ c1 = COL_NUM(f[1]);
+ r1 = ROW_NUM(f[2]);
+ c2 = COL_NUM(f[3]);
+ r2 = ROW_NUM(f[4]);
p = (f[5] == '+') ? 0x80 : 0;
return (locn(r1, c1) << 8) | locn(r2, c2) | p;
RequestInputString(fname, sizeof(fname)-1);
}
- if (fname[0] == '\0')
+ if (fname[0] == '\0') {
+ dsp->AlwaysShowMessage("aborting book save");
return;
+ }
if ((fd = fopen(fname, "a")) != NULL)
{
static void
SetOppTime(char *time)
{
- int m, t, sec;
+ int m, t;
- sec = 0;
t = (int)strtol(time, &time, 10);
if (*time == ':')
{
time++;
/* FIXME: sec is parsed but ignored */
- sec = (int)strtol(time, &time, 10);
+ (void)strtol(time, &time, 10);
}
m = (int)strtol(time, &time, 10);
static void
SetMachineTime(char *time)
{
- int m, t, sec;
+ int m, t;
- sec = 0;
t = (int)strtol(time, &time, 10);
if (*time == ':')
{
time++;
/* FIXME: sec is parsed but ignored */
- sec = (int)strtol(time, &time, 10);
+ (void)strtol(time, &time, 10);
}
m = (int)strtol(time, &time, 10);
void
InputCommand(char *command)
{
+#ifdef QUIETBACKGROUND
short have_shown_prompt = false;
+#endif
short ok, done, is_move = false;
unsigned short mv;
char s[80], sx[80];
}
else if (strcmp(s, "post") == 0)
{
- flag.post = !flag.post;
+ flag.post = (xboard ? 1 : !flag.post);
}
- else if (strcmp(s, "alg") == 0)
+ else if (strcmp(s, "nopost") == 0)
+ {
+ flag.post = 0;
+ }
+ else if (strcmp(s, "alg") == 0 ||
+ strcmp(s, "accepted") == 0 || strcmp(s, "rejected") == 0 ||
+ strcmp(s, "variant") == 0 || strcmp(s, "computer") == 0)
{
/* noop */ ;
}
{
flag.quit = true;
}
+ else if (strcmp(s, "xboard") == 0)
+ {
+ xboard = true;
+ strcpy(ColorStr[0], "White");
+ strcpy(ColorStr[1], "Black");
+ }
+ else if (strcmp(s, "protover") == 0)
+ {
+ printf("feature myname=\"GNU %sShogi %s\" variants=\"%sshogi\" debug=1 setboard=0 sigint=0 done=1\n",
+#ifdef MINISHOGI
+ "mini", PACKAGE_VERSION, "5x5+5_"
+#else
+ "", PACKAGE_VERSION, ""
+#endif
+ );
+ }
else if ((strcmp(s, "set") == 0)
|| (strcmp(s, "edit") == 0))
{
{
SetMachineTime(sx + strlen("time"));
}
- else if (strcmp(s, "otime") == 0)
+ else if ((strcmp(s, "otime") == 0) ||
+ (xboard && (strcmp(s, "otim")) == 0))
{
SetOppTime(sx + strlen("otime"));
}
flag.force = false;
Sdepth = 0;
ok = true;
+ dsp->UpdateDisplay(0, 0, 1, 0);
}
- else if (strcmp(s, "black") == 0)
+ else if (xboard ? strcmp(s, "white") == 0 : strcmp(s, "black") == 0)
{
computer = white;
opponent = black;
* ok = true; don't automatically start with black command
*/
}
- else if (strcmp(s, "white") == 0)
+ else if (xboard ? strcmp(s, "black") == 0 : strcmp(s, "white") == 0)
{
computer = black;
opponent = white;