From: Simon Tatham <anakin@pobox.com>
Date: Sat, 16 Jan 2010 12:38:15 +0000 (+0000)
Subject: Highlight the sides as well as the top of a tower when it's
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=4a9961a572e334b2e8df8ca22dd43e8079cb172e;p=sgt-puzzles.git

Highlight the sides as well as the top of a tower when it's
selected. I think this is a more or less aesthetically neutral
change for the actual selection, but the selection code is reused to
draw the victory flash and that's greatly improved by not having the
tower sides remain unflashed.

[originally from svn r8843]
---

diff --git a/towers.c b/towers.c
index c3372a3..e29da01 100644
--- a/towers.c
+++ b/towers.c
@@ -1525,12 +1525,14 @@ static void draw_tile(drawing *dr, game_drawstate *ds, struct clues *clues,
 		      int x, int y, long tile)
 {
     int w = clues->w /* , a = w*w */;
-    int tx, ty;
+    int tx, ty, bg;
     char str[64];
 
     tx = COORD(x);
     ty = COORD(y);
 
+    bg = (tile & DF_HIGHLIGHT) ? COL_HIGHLIGHT : COL_BACKGROUND;
+
     /* draw tower */
     if (ds->three_d && (tile & DF_PLAYAREA) && (tile & DF_DIGIT_MASK)) {
 	int coords[8];
@@ -1546,7 +1548,7 @@ static void draw_tile(drawing *dr, game_drawstate *ds, struct clues *clues,
 	coords[5] = coords[3] - yoff;
 	coords[6] = coords[0] + xoff;
 	coords[7] = coords[1] - yoff;
-	draw_polygon(dr, coords, 4, COL_BACKGROUND, COL_GRID);
+	draw_polygon(dr, coords, 4, bg, COL_GRID);
 
 	/* bottom face of tower */
 	coords[0] = tx + TILESIZE;
@@ -1557,7 +1559,7 @@ static void draw_tile(drawing *dr, game_drawstate *ds, struct clues *clues,
 	coords[5] = coords[3] - yoff;
 	coords[6] = coords[0] + xoff;
 	coords[7] = coords[1] - yoff;
-	draw_polygon(dr, coords, 4, COL_BACKGROUND, COL_GRID);
+	draw_polygon(dr, coords, 4, bg, COL_GRID);
 
 	/* now offset all subsequent drawing to the top of the tower */
 	tx += xoff;
@@ -1565,8 +1567,7 @@ static void draw_tile(drawing *dr, game_drawstate *ds, struct clues *clues,
     }
 
     /* erase background */
-    draw_rect(dr, tx, ty, TILESIZE, TILESIZE,
-	      (tile & DF_HIGHLIGHT) ? COL_HIGHLIGHT : COL_BACKGROUND);
+    draw_rect(dr, tx, ty, TILESIZE, TILESIZE, bg);
 
     /* pencil-mode highlight */
     if (tile & DF_HIGHLIGHT_PENCIL) {