New improved piece graphics: now drawing light and dark squares again.

cosinekitty · cosinekitty · commit 90c104b767c2 · 2021-05-02T14:14:41.000-04:00
Now that the piece bitmaps have transparent parts,
I needed to add special code to draw the light and
dark squares beneath them.
diff --git a/src/wbrdbuf.cpp b/src/wbrdbuf.cpp
@@ -184,9 +184,9 @@ void DrawBitmap (
 }
 
 
-void DrawOffboard ( HDC hdc, int x, int y, bool whiteViewFlag )
+static void FillSquare(HDC hdc, int x, int y, bool whiteViewFlag, COLORREF color)
 {
-    if ( !whiteViewFlag )
+    if (!whiteViewFlag)
     {
         x = 7 - x;
         y = 7 - y;
@@ -198,11 +198,11 @@ void DrawOffboard ( HDC hdc, int x, int y, bool whiteViewFlag )
     rect.top    = SQUARE_SCREENY1(y);
     rect.bottom = SQUARE_SCREENY2(y)+1;
 
-    HBRUSH hbrush = CreateSolidBrush (CHESS_BACKGROUND_COLOR);
+    HBRUSH hbrush = CreateSolidBrush(color);
     HBRUSH oldBrush = (HBRUSH)SelectObject ( hdc, hbrush );
-    FillRect ( hdc, &rect, hbrush );
-    SelectObject ( hdc, oldBrush );
-    DeleteObject ( hbrush );
+    FillRect(hdc, &rect, hbrush);
+    SelectObject(hdc, oldBrush);
+    DeleteObject(hbrush);
 }
 
 
@@ -215,7 +215,6 @@ void BoardDisplayBuffer::drawSquare (
     HBRUSH  oldbrush;
     HPEN    hpen;
     HPEN    oldpen;
-    int whiteSquare = (x + y) & 1;
 
     // FIXFIXFIX_GRAPHICS - render light and dark squares beneath transparent bitmaps
 
@@ -235,28 +234,27 @@ void BoardDisplayBuffer::drawSquare (
     case BQUEEN:      hbm = bq;  break;
     case BKING:       hbm = bk;  break;
 
-    case OFFBOARD:    DrawOffboard(hdc,x,y,whiteViewFlag);  return;
-
-    //case EMPTY:       hbm = whiteSquare ? ew  : eb;   break;
+    case OFFBOARD:    FillSquare(hdc,x,y,whiteViewFlag, CHESS_BACKGROUND_COLOR);  return;
     default:          hbm = NULL;
     }
 
-    DrawOffboard(hdc, x, y, whiteViewFlag);     // FIXFIXFIX_GRAPHICS !!! HACK TO TEST TRANSPARENT BITMAPS
+    COLORREF squareColor = ((x + y) & 1) ? CHESS_LIGHT_SQUARE : CHESS_DARK_SQUARE;
+    FillSquare(hdc, x, y, whiteViewFlag, squareColor);
 
     short xStart, yStart;
 
-    if ( whiteViewFlag )
+    if (whiteViewFlag)
     {
-        xStart = SQUARE_SCREENX1 ( x );
-        yStart = SQUARE_SCREENY1 ( y );
+        xStart = SQUARE_SCREENX1(x);
+        yStart = SQUARE_SCREENY1(y);
     }
     else
     {
-        xStart = SQUARE_SCREENX1 ( 7 - x );
-        yStart = SQUARE_SCREENY1 ( 7 - y );
+        xStart = SQUARE_SCREENX1(7 - x);
+        yStart = SQUARE_SCREENY1(7 - y);
     }
 
-    if (hdc != NULL)
+    if (hbm != NULL)
         DrawBitmap(hdc, hbm, xStart, yStart);
 
     if ( selX == x && selY == y )
diff --git a/src/winguich.h b/src/winguich.h
@@ -129,6 +129,8 @@ void NewBoardSize ( int );
 #define CHESS_TEXT_COLOR           RGB(255,255,255)
 #define CHESS_TEXT_COLOR2          RGB(255,255,0)
 #define CHESS_BACKGROUND_COLOR     RGB(0,0,127)
+#define CHESS_LIGHT_SQUARE         RGB(213, 219, 200)
+#define CHESS_DARK_SQUARE          RGB(155, 174, 199)
 
 bool ProcessChessCommands ( ChessBoard &board, int &source, int &dest );
 
