diff options
| -rw-r--r-- | misc.c | 6 | ||||
| -rw-r--r-- | slant.c | 15 |
2 files changed, 15 insertions, 6 deletions
@@ -187,8 +187,10 @@ void game_mkhighlight_specific(frontend *fe, float *ret, } for (i = 0; i < 3; i++) { - ret[highlight * 3 + i] = ret[background * 3 + i] * 1.2F; - ret[lowlight * 3 + i] = ret[background * 3 + i] * 0.8F; + if (highlight >= 0) + ret[highlight * 3 + i] = ret[background * 3 + i] * 1.2F; + if (lowlight >= 0) + ret[lowlight * 3 + i] = ret[background * 3 + i] * 0.8F; } } @@ -39,7 +39,8 @@ enum { COL_SLANT1, COL_SLANT2, COL_ERROR, - COL_CURSOR, COL_LOWLIGHT, /* LOWLIGHT currently not used. */ + COL_CURSOR, + COL_FILLEDSQUARE, NCOLOURS }; @@ -1809,8 +1810,12 @@ static float *game_colours(frontend *fe, int *ncolours) { float *ret = snewn(3 * NCOLOURS, float); - /* CURSOR colour is a background highlight. LOWLIGHT is unused. */ - game_mkhighlight(fe, ret, COL_BACKGROUND, COL_CURSOR, COL_LOWLIGHT); + /* CURSOR colour is a background highlight. */ + game_mkhighlight(fe, ret, COL_BACKGROUND, COL_CURSOR, -1); + + ret[COL_FILLEDSQUARE * 3 + 0] = ret[COL_BACKGROUND * 3 + 0]; + ret[COL_FILLEDSQUARE * 3 + 1] = ret[COL_BACKGROUND * 3 + 1]; + ret[COL_FILLEDSQUARE * 3 + 2] = ret[COL_BACKGROUND * 3 + 2]; ret[COL_GRID * 3 + 0] = ret[COL_BACKGROUND * 3 + 0] * 0.7F; ret[COL_GRID * 3 + 1] = ret[COL_BACKGROUND * 3 + 1] * 0.7F; @@ -1889,7 +1894,9 @@ static void draw_tile(drawing *dr, game_drawstate *ds, game_clues *clues, draw_rect(dr, COORD(x), COORD(y), TILESIZE, TILESIZE, (v & FLASH) ? COL_GRID : - (v & CURSOR) ? COL_CURSOR : COL_BACKGROUND); + (v & CURSOR) ? COL_CURSOR : + (v & (BACKSLASH | FORWSLASH)) ? COL_FILLEDSQUARE : + COL_BACKGROUND); /* * Draw the grid lines. |