X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwinboard.c;h=96bebcb4ad22a6c529d0f90f650dd6b1a592c7d4;hb=43ca8ade023eaa6b6fd2fac6b2aeb1a6ea69287f;hp=e4b8692a25517b987b4994008c554826a8334e20;hpb=904b2f075ce1b8dbe3b464a571239011698f942f;p=xboard.git

diff --git a/winboard/winboard.c b/winboard/winboard.c
index e4b8692..96bebcb 100644
--- 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");
     pieceBitmap[1][WhiteZebra] = DoLoadBitmap(hInst, "zebra", squareSize, "o");
     pieceBitmap[2][WhiteZebra] = DoLoadBitmap(hInst, "n", squareSize, "w");
+    pieceBitmap[0][WhiteTower] = DoLoadBitmap(hInst, "tower", squareSize, "s");
+    pieceBitmap[1][WhiteTower] = DoLoadBitmap(hInst, "tower", squareSize, "o");
+    pieceBitmap[2][WhiteTower] = DoLoadBitmap(hInst, "tower", squareSize, "w");
+    pieceBitmap[0][WhiteSword] = DoLoadBitmap(hInst, "sword", squareSize, "s");
+    pieceBitmap[1][WhiteSword] = DoLoadBitmap(hInst, "sword", squareSize, "o");
+    pieceBitmap[2][WhiteSword] = DoLoadBitmap(hInst, "sword", squareSize, "w");
+    pieceBitmap[0][WhiteGnu] = DoLoadBitmap(hInst, "gnu", squareSize, "s");
+    pieceBitmap[1][WhiteGnu] = DoLoadBitmap(hInst, "gnu", squareSize, "o");
+    pieceBitmap[2][WhiteGnu] = DoLoadBitmap(hInst, "gnu", squareSize, "w");
 
     if(gameInfo.variant == VariantShogi && BOARD_HEIGHT != 7) { /* promoted Gold representations (but not in Tori!)*/
       pieceBitmap[0][WhiteCannon] = DoLoadBitmap(hInst, "wp", squareSize, "s");
@@ -3755,6 +3764,8 @@ void DrawSeekClose()
 
 
 
+
+
 VOID
 HDCDrawPosition(HDC hdc, BOOLEAN repaint, Board board)
 {
@@ -4178,6 +4189,7 @@ HDCDrawPosition(HDC hdc, BOOLEAN repaint, Board board)
 	if(fac)
 	for(i=0; i<16; i++) fputDW(diagFile, color[i]);
 	// write bitmap data
+
 	for(i=0; i<wb*(b.bmHeight - boardRect.top + OUTER_MARGIN); i++) 
 		fputc(pData[i], diagFile);
 	free(pData);
@@ -6272,6 +6284,8 @@ InitComboStringsFromOption(HANDLE hwndCombo, char *str)
     str = buf1;
   }
 
+
+
   SendMessage(hwndCombo, CB_RESETCONTENT, 0, 0);
 
   for (;;) {
@@ -8530,6 +8544,11 @@ DisplayInformation(char *str)
   (void) MessageBox(hwndMain, str, _("Information"), MB_OK|MB_ICONINFORMATION);
 }
 
+char *
+Shorten (char *s)
+{
+  return s;
+}
 
 VOID
 DisplayNote(char *str)