summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorWieland Hoffmann <themineo@gmail.com>2012-02-08 14:43:23 +0100
committerJonathan Gordon <rockbox@jdgordon.info>2012-02-08 22:30:19 +0100
commitae7b59634c82646b5ff3c92a9380f0ddad948d24 (patch)
tree2e0c1a73c3b5924df7b2909c340156f76fb3d74e /apps
parentd23d164b85c5516126d77ab7038d55cebcdb6687 (diff)
downloadrockbox-ae7b59634c82646b5ff3c92a9380f0ddad948d24.zip
rockbox-ae7b59634c82646b5ff3c92a9380f0ddad948d24.tar.gz
rockbox-ae7b59634c82646b5ff3c92a9380f0ddad948d24.tar.bz2
rockbox-ae7b59634c82646b5ff3c92a9380f0ddad948d24.tar.xz
brickmania: Use short Lvl %d level indicator if needed
Change-Id: Iecbf033f14aeab715f8d0a85131a97ff82943410 Reviewed-on: http://gerrit.rockbox.org/89 Reviewed-by: Jonathan Gordon <rockbox@jdgordon.info>
Diffstat (limited to 'apps')
-rw-r--r--apps/plugins/brickmania.c24
1 files changed, 14 insertions, 10 deletions
diff --git a/apps/plugins/brickmania.c b/apps/plugins/brickmania.c
index d9c39d2..7fa320a 100644
--- a/apps/plugins/brickmania.c
+++ b/apps/plugins/brickmania.c
@@ -1598,15 +1598,6 @@ static int brickmania_game_loop(void)
}
-#if (LCD_WIDTH == 112) && (LCD_HEIGHT == 64)
- rb->snprintf(s, sizeof(s), "L%d", level+1);
-#else
- rb->snprintf(s, sizeof(s), "Level %d", level+1);
-#endif
-
- rb->lcd_getstringsize(s, &sw, NULL);
- rb->lcd_putsxy(LCD_WIDTH-sw, 0, s);
-
if (vscore<score) vscore++;
rb->snprintf(s, sizeof(s), "%d", vscore);
rb->lcd_getstringsize(s, &sw, NULL);
@@ -1615,13 +1606,26 @@ static int brickmania_game_loop(void)
/* write life num */
rb->snprintf(s, sizeof(s), "Life: %d", life);
- /* hijack i - it's reset to 0 in 17 lines */
+ /* hijack i */
i = sw;
rb->lcd_getstringsize(s, &sw, NULL);
if (sw >= (LCD_WIDTH/2-i/2))
rb->snprintf(s, sizeof(s), "L: %d", life);
rb->lcd_putsxy(0, 0, s);
+ /* write level */
+ rb->snprintf(s, sizeof(s), "Level %d", level+1);
+ rb->lcd_getstringsize(s, &sw, NULL);
+
+ if (LCD_WIDTH-sw <= (LCD_WIDTH/2+i/2)+1)
+ {
+ rb->snprintf(s, sizeof(s), "Lvl %d", level+1);
+ rb->lcd_getstringsize(s, &sw, NULL);
+ }
+
+ rb->lcd_putsxy(LCD_WIDTH-sw, 0, s);
+ i = 0;
+
/* continue game */
if (game_state == ST_PAUSE)
{