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/grid.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/grid.c')
| -rw-r--r-- | apps/plugins/puzzles/src/grid.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/apps/plugins/puzzles/src/grid.c b/apps/plugins/puzzles/src/grid.c index 89bde187be..5ea37439d4 100644 --- a/apps/plugins/puzzles/src/grid.c +++ b/apps/plugins/puzzles/src/grid.c | |||
| @@ -2378,6 +2378,8 @@ static void grid_size_floret(int width, int height, | |||
| 2378 | *tilesize = FLORET_TILESIZE; | 2378 | *tilesize = FLORET_TILESIZE; |
| 2379 | *xextent = (6*px+3*qx)/2 * (width-1) + 4*qx + 2*px; | 2379 | *xextent = (6*px+3*qx)/2 * (width-1) + 4*qx + 2*px; |
| 2380 | *yextent = (5*qy-4*py) * (height-1) + 4*qy + 2*ry; | 2380 | *yextent = (5*qy-4*py) * (height-1) + 4*qy + 2*ry; |
| 2381 | if (height == 1) | ||
| 2382 | *yextent += (5*qy-4*py)/2; | ||
| 2381 | } | 2383 | } |
| 2382 | 2384 | ||
| 2383 | static grid *grid_new_floret(int width, int height, const char *desc) | 2385 | static grid *grid_new_floret(int width, int height, const char *desc) |