diff --git a/apps/plugins/SOURCES b/apps/plugins/SOURCES index a40be68063..9ca5f89ad1 100644 --- a/apps/plugins/SOURCES +++ b/apps/plugins/SOURCES @@ -36,7 +36,7 @@ plasma.c #endif bounce.c -#if (LCD_WIDTH >= 160) && (LCD_HEIGHT >= 128) +#if ((LCD_WIDTH >= 138) && (LCD_HEIGHT >= 110)) bubbles.c #endif #if LCD_WIDTH != 128 diff --git a/apps/plugins/bitmaps/mono/SOURCES b/apps/plugins/bitmaps/mono/SOURCES index 34f0f4254b..0e8abd86f6 100644 --- a/apps/plugins/bitmaps/mono/SOURCES +++ b/apps/plugins/bitmaps/mono/SOURCES @@ -5,6 +5,8 @@ bubbles_bubble.160x128x1.bmp #elif (LCD_WIDTH == 176) && (LCD_HEIGHT == 132) bubbles_bubble.160x128x1.bmp +#elif (LCD_WIDTH == 138) && (LCD_HEIGHT == 110) +bubbles_bubble.138x110x1.bmp #elif ((LCD_WIDTH == 220) && (LCD_HEIGHT == 176)) || \ ((LCD_WIDTH == 240) && (LCD_HEIGHT == 320)) bubbles_bubble.220x176x1.bmp diff --git a/apps/plugins/bitmaps/mono/bubbles_bubble.138x110x1.bmp b/apps/plugins/bitmaps/mono/bubbles_bubble.138x110x1.bmp new file mode 100755 index 0000000000..914e98669f Binary files /dev/null and b/apps/plugins/bitmaps/mono/bubbles_bubble.138x110x1.bmp differ diff --git a/apps/plugins/bitmaps/native/SOURCES b/apps/plugins/bitmaps/native/SOURCES index fdded32a92..92c2f751aa 100644 --- a/apps/plugins/bitmaps/native/SOURCES +++ b/apps/plugins/bitmaps/native/SOURCES @@ -3,6 +3,8 @@ /* Bubbles */ #if (LCD_WIDTH == 160) && (LCD_HEIGHT == 128) && !defined(HAVE_LCD_COLOR) bubbles_emblem.160x128x2.bmp +#elif (LCD_WIDTH == 138) && (LCD_HEIGHT == 110) +bubbles_emblem.138x110x2.bmp #elif (LCD_WIDTH == 160) && (LCD_HEIGHT == 128) && defined(HAVE_LCD_COLOR) bubbles_emblem.160x128x16.bmp bubbles_left.160x128x16.bmp diff --git a/apps/plugins/bitmaps/native/bubbles_emblem.138x110x2.bmp b/apps/plugins/bitmaps/native/bubbles_emblem.138x110x2.bmp new file mode 100755 index 0000000000..9f993e3565 Binary files /dev/null and b/apps/plugins/bitmaps/native/bubbles_emblem.138x110x2.bmp differ diff --git a/apps/plugins/bubbles.c b/apps/plugins/bubbles.c index 7ff8b62554..19bc7a12f1 100755 --- a/apps/plugins/bubbles.c +++ b/apps/plugins/bubbles.c @@ -144,6 +144,15 @@ PLUGIN_HEADER #define ROW_INDENT 6 #define MAX_FPS 30 +/* 10x10 bubbles (iPod Mini) */ +#elif (LCD_HEIGHT == 110) && (LCD_WIDTH == 138) +#define BUBBLE_SZ 10 +#define EMBLEM_SZ 6 +#define XOFS 33 +#define ROW_HEIGHT 8 +#define ROW_INDENT 6 +#define MAX_FPS 30 + #else #error BUBBLES: Unsupported LCD type #endif @@ -2436,10 +2445,18 @@ static int bubbles(struct game_context* bb) { rb->snprintf(str, 28, "Start on level %d of %d", startlevel+1, bb->highlevel+1); rb->lcd_puts(0, 10, str); +#if LCD_HEIGHT > 110 rb->lcd_puts(0, 12, "High Score:"); +#else + rb->lcd_puts(0, 11, "High Score:"); +#endif rb->snprintf(str, 30, "%d, Lvl %d", bb->highscores[0].score, bb->highscores[0].level); +#if LCD_HEIGHT > 110 rb->lcd_puts(2, 13, str); +#else + rb->lcd_puts(2, 12, str); +#endif } else { /* show high scores */ rb->snprintf(str, 12, "%s", "High Scores");