From 686be7b1d12f8c2b3ad58430c1c79093a7652065 Mon Sep 17 00:00:00 2001 From: H.G. Muller Date: Wed, 27 Oct 2010 12:11:02 +0200 Subject: [PATCH] Complete WB (western) bitmaps for Shogi at size 33 The Lance was not replacing Queen in some sizes where the bitmaps were already available, and new bitmaps for the promotion Golds were added. --- winboard/winboard.c | 2 +- winboard/winboard.rc | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/winboard/winboard.c b/winboard/winboard.c index afef6ae..ec17e47 100644 --- a/winboard/winboard.c +++ b/winboard/winboard.c @@ -2459,7 +2459,7 @@ InitDrawingSizes(BoardSize boardSize, int flags) pieceBitmap[2][WhiteBishop] = DoLoadBitmap(hInst, "b", squareSize, "w"); pieceBitmap[2][WhiteRook] = DoLoadBitmap(hInst, "r", squareSize, "w"); pieceBitmap[2][WhiteKing] = DoLoadBitmap(hInst, "k", squareSize, "w"); - if( gameInfo.variant == VariantShogi && (squareSize==72 || squareSize==49)) { + if( gameInfo.variant == VariantShogi && squareSize <= 72 && squareSize >= 33) { // in Shogi, Hijack the unused Queen for Lance pieceBitmap[0][WhiteQueen] = DoLoadBitmap(hInst, "l", squareSize, "s"); pieceBitmap[1][WhiteQueen] = DoLoadBitmap(hInst, "l", squareSize, "o"); diff --git a/winboard/winboard.rc b/winboard/winboard.rc index 497f674..bb8cd3f 100644 --- a/winboard/winboard.rc +++ b/winboard/winboard.rc @@ -1933,6 +1933,10 @@ W33O BITMAP MOVEABLE PURE "bitmaps/w33o.bmp" M33O BITMAP MOVEABLE PURE "bitmaps/m33o.bmp" O33O BITMAP MOVEABLE PURE "bitmaps/o33o.bmp" DK33O BITMAP MOVEABLE PURE "bitmaps/dk33o.bmp" +WP33O BITMAP MOVEABLE PURE "bitmaps/wp33o.bmp" +WN33O BITMAP MOVEABLE PURE "bitmaps/wn33o.bmp" +WL33O BITMAP MOVEABLE PURE "bitmaps/wl33o.bmp" +WS33O BITMAP MOVEABLE PURE "bitmaps/ws33o.bmp" A33W BITMAP MOVEABLE PURE "bitmaps/a33w.bmp" AA33W BITMAP MOVEABLE PURE "bitmaps/as33w.bmp" C33W BITMAP MOVEABLE PURE "bitmaps/c33w.bmp" @@ -1961,6 +1965,10 @@ W33S BITMAP MOVEABLE PURE "bitmaps/w33s.bmp" M33S BITMAP MOVEABLE PURE "bitmaps/m33s.bmp" O33S BITMAP MOVEABLE PURE "bitmaps/o33s.bmp" DK33S BITMAP MOVEABLE PURE "bitmaps/dk33s.bmp" +WP33S BITMAP MOVEABLE PURE "bitmaps/wp33s.bmp" +WN33S BITMAP MOVEABLE PURE "bitmaps/wn33s.bmp" +WL33S BITMAP MOVEABLE PURE "bitmaps/wl33s.bmp" +WS33S BITMAP MOVEABLE PURE "bitmaps/ws33s.bmp" A37O BITMAP MOVEABLE PURE "bitmaps/a37o.bmp" L37O BITMAP MOVEABLE PURE "bitmaps/l37o.bmp" -- 1.7.0.4