From: H.G.Muller Date: Sun, 28 Sep 2014 09:18:10 +0000 (+0200) Subject: Suppress use of promo-Gold bitmaps in Tori Shogi (WB) X-Git-Url: http://winboard.nl/cgi-bin?p=xboard.git;a=commitdiff_plain;h=3e9bdc4b4412453619340999d96d245c7f5f8b74 Suppress use of promo-Gold bitmaps in Tori Shogi (WB) In Tori Shogi the Swallow Pawn does not promote to Tokin, so the use of a Gold General pictogram would only be confusing. So we stick to the regular fairy bitmaps in Tori, which is recognized by the board having 7 ranks in Shogi. --- diff --git a/winboard/winboard.c b/winboard/winboard.c index db317ce..d0eb772 100644 --- a/winboard/winboard.c +++ b/winboard/winboard.c @@ -2690,7 +2690,7 @@ InitDrawingSizes(BoardSize boardSize, int flags) pieceBitmap[1][WhiteLion] = DoLoadBitmap(hInst, "ln", squareSize, "o"); pieceBitmap[2][WhiteLion] = DoLoadBitmap(hInst, "ln", squareSize, "w"); - if(gameInfo.variant == VariantShogi) { /* promoted Gold represemtations */ + if(gameInfo.variant == VariantShogi && BOARD_HEIGHT != 7) { /* promoted Gold representations (but not in Tori!)*/ pieceBitmap[0][WhiteCannon] = DoLoadBitmap(hInst, "wp", squareSize, "s"); pieceBitmap[1][WhiteCannon] = DoLoadBitmap(hInst, "wp", squareSize, "o"); pieceBitmap[2][WhiteCannon] = DoLoadBitmap(hInst, "w", squareSize, "w"); @@ -5740,6 +5740,7 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) return (DefWindowProc(hwnd, message, wParam, lParam)); } + return 0; }