From 48b0ef1cf22ec37927116ac83ea7c7cfc1f9083e Mon Sep 17 00:00:00 2001 From: Franklin Wei Date: Thu, 25 Jun 2020 14:44:33 -0400 Subject: puzzles: resync with upstream This brings the upstream version to 9aa7b7c (with some of my changes as well). Change-Id: I5bf8a3e0b8672d82cb1bf34afc07adbe12a3ac53 --- apps/plugins/puzzles/src/pattern.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'apps/plugins/puzzles/src/pattern.c') diff --git a/apps/plugins/puzzles/src/pattern.c b/apps/plugins/puzzles/src/pattern.c index 42f3fc55ce..a43982f452 100644 --- a/apps/plugins/puzzles/src/pattern.c +++ b/apps/plugins/puzzles/src/pattern.c @@ -20,6 +20,7 @@ enum { COL_GRID, COL_CURSOR, COL_ERROR, + COL_CURSOR_GUIDE, NCOLOURS }; @@ -1660,11 +1661,12 @@ static float *game_colours(frontend *fe, int *ncolours) frontend_default_colour(fe, &ret[COL_BACKGROUND * 3]); for (i = 0; i < 3; i++) { - ret[COL_GRID * 3 + i] = 0.3F; - ret[COL_UNKNOWN * 3 + i] = 0.5F; - ret[COL_TEXT * 3 + i] = 0.0F; - ret[COL_FULL * 3 + i] = 0.0F; - ret[COL_EMPTY * 3 + i] = 1.0F; + ret[COL_GRID * 3 + i] = 0.3F; + ret[COL_UNKNOWN * 3 + i] = 0.5F; + ret[COL_TEXT * 3 + i] = 0.0F; + ret[COL_FULL * 3 + i] = 0.0F; + ret[COL_EMPTY * 3 + i] = 1.0F; + ret[COL_CURSOR_GUIDE * 3 + i] = 0.5F; } ret[COL_CURSOR * 3 + 0] = 1.0F; ret[COL_CURSOR * 3 + 1] = 0.25F; @@ -1891,6 +1893,9 @@ static void game_redraw(drawing *dr, game_drawstate *ds, */ for (i = 0; i < state->common->w + state->common->h; i++) { int colour = check_errors(state, i) ? COL_ERROR : COL_TEXT; + if (colour == COL_TEXT && ((cx >= 0 && i == cx) || (cy >= 0 && i == cy + ds->w))) { + colour = COL_CURSOR_GUIDE; + } if (ds->numcolours[i] != colour) { draw_numbers(dr, ds, state, i, true, colour); ds->numcolours[i] = colour; -- cgit v1.2.3