diff options
author | Franklin Wei <franklin@rockbox.org> | 2020-06-25 14:44:33 -0400 |
---|---|---|
committer | Franklin Wei <franklin@rockbox.org> | 2020-06-25 18:45:58 +0000 |
commit | 48b0ef1cf22ec37927116ac83ea7c7cfc1f9083e (patch) | |
tree | 148ced6ae04e578abc38a38e92879fa13b97a604 /apps/plugins/puzzles/src/pattern.c | |
parent | dd3a8e08988308cf88c10a44176d83a8a152ec4a (diff) | |
download | rockbox-48b0ef1cf22ec37927116ac83ea7c7cfc1f9083e.tar.gz rockbox-48b0ef1cf22ec37927116ac83ea7c7cfc1f9083e.zip |
puzzles: resync with upstream
This brings the upstream version to 9aa7b7c (with some of my changes as
well).
Change-Id: I5bf8a3e0b8672d82cb1bf34afc07adbe12a3ac53
Diffstat (limited to 'apps/plugins/puzzles/src/pattern.c')
-rw-r--r-- | apps/plugins/puzzles/src/pattern.c | 15 |
1 files changed, 10 insertions, 5 deletions
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 { | |||
20 | COL_GRID, | 20 | COL_GRID, |
21 | COL_CURSOR, | 21 | COL_CURSOR, |
22 | COL_ERROR, | 22 | COL_ERROR, |
23 | COL_CURSOR_GUIDE, | ||
23 | NCOLOURS | 24 | NCOLOURS |
24 | }; | 25 | }; |
25 | 26 | ||
@@ -1660,11 +1661,12 @@ static float *game_colours(frontend *fe, int *ncolours) | |||
1660 | frontend_default_colour(fe, &ret[COL_BACKGROUND * 3]); | 1661 | frontend_default_colour(fe, &ret[COL_BACKGROUND * 3]); |
1661 | 1662 | ||
1662 | for (i = 0; i < 3; i++) { | 1663 | for (i = 0; i < 3; i++) { |
1663 | ret[COL_GRID * 3 + i] = 0.3F; | 1664 | ret[COL_GRID * 3 + i] = 0.3F; |
1664 | ret[COL_UNKNOWN * 3 + i] = 0.5F; | 1665 | ret[COL_UNKNOWN * 3 + i] = 0.5F; |
1665 | ret[COL_TEXT * 3 + i] = 0.0F; | 1666 | ret[COL_TEXT * 3 + i] = 0.0F; |
1666 | ret[COL_FULL * 3 + i] = 0.0F; | 1667 | ret[COL_FULL * 3 + i] = 0.0F; |
1667 | ret[COL_EMPTY * 3 + i] = 1.0F; | 1668 | ret[COL_EMPTY * 3 + i] = 1.0F; |
1669 | ret[COL_CURSOR_GUIDE * 3 + i] = 0.5F; | ||
1668 | } | 1670 | } |
1669 | ret[COL_CURSOR * 3 + 0] = 1.0F; | 1671 | ret[COL_CURSOR * 3 + 0] = 1.0F; |
1670 | ret[COL_CURSOR * 3 + 1] = 0.25F; | 1672 | ret[COL_CURSOR * 3 + 1] = 0.25F; |
@@ -1891,6 +1893,9 @@ static void game_redraw(drawing *dr, game_drawstate *ds, | |||
1891 | */ | 1893 | */ |
1892 | for (i = 0; i < state->common->w + state->common->h; i++) { | 1894 | for (i = 0; i < state->common->w + state->common->h; i++) { |
1893 | int colour = check_errors(state, i) ? COL_ERROR : COL_TEXT; | 1895 | int colour = check_errors(state, i) ? COL_ERROR : COL_TEXT; |
1896 | if (colour == COL_TEXT && ((cx >= 0 && i == cx) || (cy >= 0 && i == cy + ds->w))) { | ||
1897 | colour = COL_CURSOR_GUIDE; | ||
1898 | } | ||
1894 | if (ds->numcolours[i] != colour) { | 1899 | if (ds->numcolours[i] != colour) { |
1895 | draw_numbers(dr, ds, state, i, true, colour); | 1900 | draw_numbers(dr, ds, state, i, true, colour); |
1896 | ds->numcolours[i] = colour; | 1901 | ds->numcolours[i] = colour; |