From: Yann Dirson Date: Sun, 19 Jan 2014 21:23:03 +0000 (+0100) Subject: Get rid of redundant "barebones" flag, essentially used as synonym for "XSHOGI". X-Git-Url: http://winboard.nl/cgi-bin?p=gnushogi.git;a=commitdiff_plain;h=0edbcf26d5dbe0e17ce09cfa473fb41f8ec255f3 Get rid of redundant "barebones" flag, essentially used as synonym for "XSHOGI". --- diff --git a/gnushogi/commondsp.c b/gnushogi/commondsp.c index a6f567d..1c51387 100644 --- a/gnushogi/commondsp.c +++ b/gnushogi/commondsp.c @@ -167,7 +167,7 @@ algbr(short f, short t, short flag) if ((f == t) && ((f != 0) || (t != 0))) { - if (!barebones) { + if (!XSHOGI) { dsp->Printf("error in algbr: FROM=TO=%d, flag=0x%4x\n", t, flag); } @@ -344,7 +344,7 @@ VerifyMove(char *s, VerifyMove_mode iop, unsigned short *mv) dsp->AlwaysShowMessage("Illegal move (no match) %s", s); - if (!barebones && (cnt > 1)) + if (!XSHOGI && (cnt > 1)) { sprintf(buffer, "Ambiguous Move %s!", s); dsp->ShowMessage(buffer); diff --git a/gnushogi/gnushogi.h b/gnushogi/gnushogi.h index edea646..462c88a 100644 --- a/gnushogi/gnushogi.h +++ b/gnushogi/gnushogi.h @@ -65,7 +65,6 @@ extern display_t display_type; /* Miscellaneous globals. */ extern short hard_time_limit; /* If you exceed time limit, you lose. */ -extern short barebones; /* Don't print of stats for x interface. */ extern short nolist; /* Don't list game after exit. */ diff --git a/gnushogi/init.c b/gnushogi/init.c index b0f63df..679b382 100644 --- a/gnushogi/init.c +++ b/gnushogi/init.c @@ -50,8 +50,6 @@ */ short hard_time_limit = 1; -short barebones = 0; /* Suppress printing of statistics - * (mainly for xshogi). */ #ifdef LIST_ON_EXIT short nolist = 0; /* List the game after exit. */ #else @@ -667,13 +665,11 @@ InitMain(void) TCflag = true; OperatorTime = 0; - barebones = 1; } else { TCflag = false; OperatorTime = 0; - barebones = 0; } dsp->Initialize(); diff --git a/gnushogi/rawdsp.c b/gnushogi/rawdsp.c index 042ffd8..a375813 100644 --- a/gnushogi/rawdsp.c +++ b/gnushogi/rawdsp.c @@ -65,7 +65,7 @@ void Raw_UpdateDisplay(short f, short t, short redraw, short isspec); void Raw_ClearScreen(void) { - if (!barebones && !XSHOGI) + if (!XSHOGI) printf("\n"); } @@ -73,7 +73,7 @@ Raw_ClearScreen(void) void Raw_ShowPrompt(void) { - if (!barebones && !XSHOGI) + if (!XSHOGI) fputs("\nYour move is? ", stdout); } @@ -87,7 +87,7 @@ Raw_ShowCurrentMove(short pnt, short f, short t) void Raw_ShowDepth(char ch) { - if (!barebones && !XSHOGI) + if (!XSHOGI) printf("Depth= %d%c \n", Sdepth, ch); } @@ -594,10 +594,10 @@ Raw_OutputMove(void) else if (root->score == (SCORE_LIMIT + 998)) printf("%s mates!\n", ColorStr[computer]); #ifdef VERYBUGGY - else if (!barebones && (root->score < -SCORE_LIMIT)) + else if (!XSHOGI && (root->score < -SCORE_LIMIT)) printf("%s has a forced mate in %d moves!\n", ColorStr[opponent], SCORE_LIMIT + 999 + root->score - 1); - else if (!barebones && (root->score > SCORE_LIMIT)) + else if (!XSHOGI && (root->score > SCORE_LIMIT)) printf("%s has a forced mate in %d moves!\n", ColorStr[computer], SCORE_LIMIT + 998 - root->score - 1); #endif /* VERYBUGGY */ diff --git a/gnushogi/util.c b/gnushogi/util.c index 4f746b9..927f3d8 100644 --- a/gnushogi/util.c +++ b/gnushogi/util.c @@ -174,7 +174,7 @@ ProbeTTable (short side, { HashCol++; - if (!barebones) + if (!XSHOGI) { ShowMessage("ttable collision detected"); ShowBD(ptbl->bd);