Add Tower, Sword and Gnu piece images (WB)

Bitmaps for the Tower and Sword piece types are added to WinBoard for
size bulky (72x72) and middling (49x49), so the first 26 contiguous pieces
all have built-in images in these sizes. Gnu images are also added.

diff --git a/winboard/bitmaps/gnu49o.bmp b/winboard/bitmaps/gnu49o.bmp
new file mode 100644 (file)
index 0000000..06c1b32
Binary files /dev/null and b/winboard/bitmaps/gnu49o.bmp differ

diff --git a/winboard/bitmaps/gnu49s.bmp b/winboard/bitmaps/gnu49s.bmp
new file mode 100644 (file)
index 0000000..c50db0d
Binary files /dev/null and b/winboard/bitmaps/gnu49s.bmp differ

diff --git a/winboard/bitmaps/gnu49w.bmp b/winboard/bitmaps/gnu49w.bmp
new file mode 100644 (file)
index 0000000..756ae88
Binary files /dev/null and b/winboard/bitmaps/gnu49w.bmp differ

diff --git a/winboard/bitmaps/gnu72o.bmp b/winboard/bitmaps/gnu72o.bmp
new file mode 100644 (file)
index 0000000..bdaf742
Binary files /dev/null and b/winboard/bitmaps/gnu72o.bmp differ

diff --git a/winboard/bitmaps/gnu72s.bmp b/winboard/bitmaps/gnu72s.bmp
new file mode 100644 (file)
index 0000000..30abbaf
Binary files /dev/null and b/winboard/bitmaps/gnu72s.bmp differ

diff --git a/winboard/bitmaps/gnu72w.bmp b/winboard/bitmaps/gnu72w.bmp
new file mode 100644 (file)
index 0000000..de499b4
Binary files /dev/null and b/winboard/bitmaps/gnu72w.bmp differ

diff --git a/winboard/bitmaps/sword49o.bmp b/winboard/bitmaps/sword49o.bmp
new file mode 100644 (file)
index 0000000..b59a9b4
Binary files /dev/null and b/winboard/bitmaps/sword49o.bmp differ

diff --git a/winboard/bitmaps/sword49s.bmp b/winboard/bitmaps/sword49s.bmp
new file mode 100644 (file)
index 0000000..59c1ce5
Binary files /dev/null and b/winboard/bitmaps/sword49s.bmp differ

diff --git a/winboard/bitmaps/sword49w.bmp b/winboard/bitmaps/sword49w.bmp
new file mode 100644 (file)
index 0000000..5776b84
Binary files /dev/null and b/winboard/bitmaps/sword49w.bmp differ

diff --git a/winboard/bitmaps/sword72o.bmp b/winboard/bitmaps/sword72o.bmp
new file mode 100644 (file)
index 0000000..6da2a47
Binary files /dev/null and b/winboard/bitmaps/sword72o.bmp differ

diff --git a/winboard/bitmaps/sword72s.bmp b/winboard/bitmaps/sword72s.bmp
new file mode 100644 (file)
index 0000000..734e416
Binary files /dev/null and b/winboard/bitmaps/sword72s.bmp differ

diff --git a/winboard/bitmaps/sword72w.bmp b/winboard/bitmaps/sword72w.bmp
new file mode 100644 (file)
index 0000000..20d4367
Binary files /dev/null and b/winboard/bitmaps/sword72w.bmp differ

diff --git a/winboard/bitmaps/tower49o.bmp b/winboard/bitmaps/tower49o.bmp
new file mode 100644 (file)
index 0000000..4387003
Binary files /dev/null and b/winboard/bitmaps/tower49o.bmp differ

diff --git a/winboard/bitmaps/tower49s.bmp b/winboard/bitmaps/tower49s.bmp
new file mode 100644 (file)
index 0000000..584a612
Binary files /dev/null and b/winboard/bitmaps/tower49s.bmp differ

diff --git a/winboard/bitmaps/tower49w.bmp b/winboard/bitmaps/tower49w.bmp
new file mode 100644 (file)
index 0000000..23c8570
Binary files /dev/null and b/winboard/bitmaps/tower49w.bmp differ

diff --git a/winboard/bitmaps/tower72o.bmp b/winboard/bitmaps/tower72o.bmp
new file mode 100644 (file)
index 0000000..ddc042c
Binary files /dev/null and b/winboard/bitmaps/tower72o.bmp differ

diff --git a/winboard/bitmaps/tower72s.bmp b/winboard/bitmaps/tower72s.bmp
new file mode 100644 (file)
index 0000000..020acf3
Binary files /dev/null and b/winboard/bitmaps/tower72s.bmp differ

diff --git a/winboard/bitmaps/tower72w.bmp b/winboard/bitmaps/tower72w.bmp
new file mode 100644 (file)
index 0000000..1569a2d
Binary files /dev/null and b/winboard/bitmaps/tower72w.bmp differ

diff --git a/winboard/winboard.c b/winboard/winboard.c
index 2301293..96bebcb 100644 (file)
--- a/winboard/winboard.c
+++ b/winboard/winboard.c
@@ -2727,6 +2727,15 @@ InitDrawingSizes(BoardSize boardSize, int flags)
     pieceBitmap[0][WhiteZebra] = DoLoadBitmap(hInst, "zebra", squareSize, "s");\r
     pieceBitmap[1][WhiteZebra] = DoLoadBitmap(hInst, "zebra", squareSize, "o");\r
     pieceBitmap[2][WhiteZebra] = DoLoadBitmap(hInst, "n", squareSize, "w");\r
+    pieceBitmap[0][WhiteTower] = DoLoadBitmap(hInst, "tower", squareSize, "s");\r
+    pieceBitmap[1][WhiteTower] = DoLoadBitmap(hInst, "tower", squareSize, "o");\r
+    pieceBitmap[2][WhiteTower] = DoLoadBitmap(hInst, "tower", squareSize, "w");\r
+    pieceBitmap[0][WhiteSword] = DoLoadBitmap(hInst, "sword", squareSize, "s");\r
+    pieceBitmap[1][WhiteSword] = DoLoadBitmap(hInst, "sword", squareSize, "o");\r
+    pieceBitmap[2][WhiteSword] = DoLoadBitmap(hInst, "sword", squareSize, "w");\r
+    pieceBitmap[0][WhiteGnu] = DoLoadBitmap(hInst, "gnu", squareSize, "s");\r
+    pieceBitmap[1][WhiteGnu] = DoLoadBitmap(hInst, "gnu", squareSize, "o");\r
+    pieceBitmap[2][WhiteGnu] = DoLoadBitmap(hInst, "gnu", squareSize, "w");\r
 \r
     if(gameInfo.variant == VariantShogi && BOARD_HEIGHT != 7) { /* promoted Gold representations (but not in Tori!)*/\r
       pieceBitmap[0][WhiteCannon] = DoLoadBitmap(hInst, "wp", squareSize, "s");\r
@@ -3756,6 +3765,7 @@ void DrawSeekClose()
 \r
 \r
 \r
+\r
 VOID\r
 HDCDrawPosition(HDC hdc, BOOLEAN repaint, Board board)\r
 {\r
@@ -4179,6 +4189,7 @@ HDCDrawPosition(HDC hdc, BOOLEAN repaint, Board board)
        if(fac)\r
        for(i=0; i<16; i++) fputDW(diagFile, color[i]);\r
        // write bitmap data\r
+\r
        for(i=0; i<wb*(b.bmHeight - boardRect.top + OUTER_MARGIN); i++) \r
                fputc(pData[i], diagFile);\r
        free(pData);\r
@@ -6274,6 +6285,7 @@ InitComboStringsFromOption(HANDLE hwndCombo, char *str)
   }\r
 \r
 \r
+\r
   SendMessage(hwndCombo, CB_RESETCONTENT, 0, 0);\r
 \r
   for (;;) {\r

diff --git a/winboard/winboard.rc b/winboard/winboard.rc
index c55c6da..42feaf5 100644 (file)
--- a/winboard/winboard.rc
+++ b/winboard/winboard.rc
@@ -775,6 +775,9 @@ BEGIN
     CONTROL         "",OPT_EngineVariant+5,"Button",BS_AUTORADIOBUTTON,154,144,70,10\r
     CONTROL         "",OPT_EngineVariant+6,"Button",BS_AUTORADIOBUTTON,9,154,70,10\r
 \r
+\r
+\r
+\r
     CONTROL         "",OPT_EngineVariant+7,"Button",BS_AUTORADIOBUTTON,80,154,70,10\r
     CONTROL         "",OPT_EngineVariant+8,"Button",BS_AUTORADIOBUTTON,154,154,70,10\r
     CONTROL         "",OPT_EngineVariant+9,"Button",BS_AUTORADIOBUTTON,9,164,70,10\r
@@ -1940,6 +1943,9 @@ LN72O                   BITMAP  MOVEABLE PURE   "bitmaps/ln72o.bmp"
 WOLF72O                 BITMAP  MOVEABLE PURE   "bitmaps/wolf72o.bmp"\r
 CAMEL72O                BITMAP  MOVEABLE PURE   "bitmaps/camel72o.bmp"\r
 ZEBRA72O                BITMAP  MOVEABLE PURE   "bitmaps/zebra72o.bmp"\r
+TOWER72O                BITMAP  MOVEABLE PURE   "bitmaps/tower72o.bmp"\r
+SWORD72O                BITMAP  MOVEABLE PURE   "bitmaps/sword72o.bmp"\r
+GNU72O                  BITMAP  MOVEABLE PURE   "bitmaps/gnu72o.bmp"\r
 WP72O                   BITMAP  MOVEABLE PURE   "bitmaps/wp72o.bmp"\r
 WN72O                   BITMAP  MOVEABLE PURE   "bitmaps/wn72o.bmp"\r
 WL72O                   BITMAP  MOVEABLE PURE   "bitmaps/wl72o.bmp"\r
@@ -1964,6 +1970,9 @@ LN72S                   BITMAP  MOVEABLE PURE   "bitmaps/ln72s.bmp"
 WOLF72S                 BITMAP  MOVEABLE PURE   "bitmaps/wolf72s.bmp"\r
 CAMEL72S                BITMAP  MOVEABLE PURE   "bitmaps/camel72s.bmp"\r
 ZEBRA72S                BITMAP  MOVEABLE PURE   "bitmaps/zebra72s.bmp"\r
+TOWER72S                BITMAP  MOVEABLE PURE   "bitmaps/tower72s.bmp"\r
+SWORD72S                BITMAP  MOVEABLE PURE   "bitmaps/sword72s.bmp"\r
+GNU72S                  BITMAP  MOVEABLE PURE   "bitmaps/gnu72s.bmp"\r
 WP72S                   BITMAP  MOVEABLE PURE   "bitmaps/wp72s.bmp"\r
 WN72S                   BITMAP  MOVEABLE PURE   "bitmaps/wn72s.bmp"\r
 WL72S                   BITMAP  MOVEABLE PURE   "bitmaps/wl72s.bmp"\r
@@ -1987,6 +1996,9 @@ DK72W                   BITMAP  MOVEABLE PURE   "bitmaps/dk72w.bmp"
 LN72W                   BITMAP  MOVEABLE PURE   "bitmaps/ln72w.bmp"\r
 WOLF72W                 BITMAP  MOVEABLE PURE   "bitmaps/wolf72w.bmp"\r
 CAMEL72W                BITMAP  MOVEABLE PURE   "bitmaps/camel72w.bmp"\r
+TOWER72W                BITMAP  MOVEABLE PURE   "bitmaps/tower72w.bmp"\r
+SWORD72W                BITMAP  MOVEABLE PURE   "bitmaps/sword72w.bmp"\r
+GNU72W                  BITMAP  MOVEABLE PURE   "bitmaps/gnu72w.bmp"\r
 E49O                    BITMAP  MOVEABLE PURE   "bitmaps/e49o.bmp"\r
 A49O                    BITMAP  MOVEABLE PURE   "bitmaps/a49o.bmp"\r
 AA49O                   BITMAP  MOVEABLE PURE   "bitmaps/as49o.bmp"\r
@@ -2007,6 +2019,9 @@ LN49O                   BITMAP  MOVEABLE PURE   "bitmaps/ln49o.bmp"
 WOLF49O                 BITMAP  MOVEABLE PURE   "bitmaps/wolf49o.bmp"\r
 CAMEL49O                BITMAP  MOVEABLE PURE   "bitmaps/camel49o.bmp"\r
 ZEBRA49O                BITMAP  MOVEABLE PURE   "bitmaps/zebra49o.bmp"\r
+TOWER49O                BITMAP  MOVEABLE PURE   "bitmaps/tower49o.bmp"\r
+SWORD49O                BITMAP  MOVEABLE PURE   "bitmaps/sword49o.bmp"\r
+GNU49O                  BITMAP  MOVEABLE PURE   "bitmaps/gnu49o.bmp"\r
 WP49O                   BITMAP  MOVEABLE PURE   "bitmaps/wp49o.bmp"\r
 WN49O                   BITMAP  MOVEABLE PURE   "bitmaps/wn49o.bmp"\r
 WL49O                   BITMAP  MOVEABLE PURE   "bitmaps/wl49o.bmp"\r
@@ -2032,6 +2047,9 @@ LN49S                   BITMAP  MOVEABLE PURE   "bitmaps/ln49s.bmp"
 WOLF49S                 BITMAP  MOVEABLE PURE   "bitmaps/wolf49s.bmp"\r
 CAMEL49S                BITMAP  MOVEABLE PURE   "bitmaps/camel49s.bmp"\r
 ZEBRA49S                BITMAP  MOVEABLE PURE   "bitmaps/zebra49s.bmp"\r
+TOWER49S                BITMAP  MOVEABLE PURE   "bitmaps/tower49s.bmp"\r
+SWORD49S                BITMAP  MOVEABLE PURE   "bitmaps/sword49s.bmp"\r
+GNU49S                  BITMAP  MOVEABLE PURE   "bitmaps/gnu49s.bmp"\r
 WP49S                   BITMAP  MOVEABLE PURE   "bitmaps/wp49s.bmp"\r
 WN49S                   BITMAP  MOVEABLE PURE   "bitmaps/wn49s.bmp"\r
 WL49S                   BITMAP  MOVEABLE PURE   "bitmaps/wl49s.bmp"\r
@@ -2055,6 +2073,9 @@ DK49W                   BITMAP  MOVEABLE PURE   "bitmaps/dk49w.bmp"
 LN49W                   BITMAP  MOVEABLE PURE   "bitmaps/ln49w.bmp"\r
 WOLF49W                 BITMAP  MOVEABLE PURE   "bitmaps/wolf49w.bmp"\r
 CAMEL49W                BITMAP  MOVEABLE PURE   "bitmaps/camel49w.bmp"\r
+TOWER49W                BITMAP  MOVEABLE PURE   "bitmaps/tower49w.bmp"\r
+SWORD49W                BITMAP  MOVEABLE PURE   "bitmaps/sword49w.bmp"\r
+GNU49W                  BITMAP  MOVEABLE PURE   "bitmaps/gnu49w.bmp"\r
 A33O                    BITMAP  MOVEABLE PURE   "bitmaps/a33o.bmp"\r
 AA33O                   BITMAP  MOVEABLE PURE   "bitmaps/as33o.bmp"\r
 C33O                    BITMAP  MOVEABLE PURE   "bitmaps/c33o.bmp"\r