diff options
Diffstat (limited to 'apps/plugins/bubbles.c')
-rwxr-xr-x | apps/plugins/bubbles.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/apps/plugins/bubbles.c b/apps/plugins/bubbles.c index be3783cdc9..196587a9d9 100755 --- a/apps/plugins/bubbles.c +++ b/apps/plugins/bubbles.c | |||
@@ -175,8 +175,8 @@ PLUGIN_HEADER | |||
175 | #define ROW_INDENT 6 | 175 | #define ROW_INDENT 6 |
176 | #define MAX_FPS 40 | 176 | #define MAX_FPS 40 |
177 | 177 | ||
178 | /* 12x12 bubbles (H100, iAudio X5, iPod 3G, iPod 4G grayscale) */ | 178 | /* 12x12 bubbles (H100, H10, iAudio X5, iPod 3G, iPod 4G grayscale) */ |
179 | #elif (LCD_HEIGHT == 128) && (LCD_WIDTH == 160) | 179 | #elif (LCD_HEIGHT == 128) && ((LCD_WIDTH == 160) || (LCD_WIDTH == 128)) |
180 | #define BUBBLE_WIDTH 12 | 180 | #define BUBBLE_WIDTH 12 |
181 | #define BUBBLE_HEIGHT 12 | 181 | #define BUBBLE_HEIGHT 12 |
182 | #define EMBLEM_WIDTH 8 | 182 | #define EMBLEM_WIDTH 8 |
@@ -224,10 +224,13 @@ PLUGIN_HEADER | |||
224 | /* external bitmaps */ | 224 | /* external bitmaps */ |
225 | extern const fb_data bubbles_bubble[]; | 225 | extern const fb_data bubbles_bubble[]; |
226 | extern const fb_data bubbles_emblem[]; | 226 | extern const fb_data bubbles_emblem[]; |
227 | #ifdef HAVE_LCD_COLOR | 227 | #ifdef HAVE_LCD_COLOR |
228 | extern const fb_data bubbles_left[]; | 228 | extern const fb_data bubbles_left[]; |
229 | /* skip right border for square screens */ | ||
230 | #if (LCD_WIDTH > LCD_HEIGHT) | ||
229 | extern const fb_data bubbles_right[]; | 231 | extern const fb_data bubbles_right[]; |
230 | #endif | 232 | #endif |
233 | #endif | ||
231 | 234 | ||
232 | /* global rockbox api */ | 235 | /* global rockbox api */ |
233 | static struct plugin_api* rb; | 236 | static struct plugin_api* rb; |
@@ -1506,9 +1509,12 @@ static void bubbles_drawboard(struct game_context* bb) { | |||
1506 | /* draw sidebars */ | 1509 | /* draw sidebars */ |
1507 | #ifdef HAVE_LCD_COLOR | 1510 | #ifdef HAVE_LCD_COLOR |
1508 | rb->lcd_bitmap(bubbles_left, 0, 0, XOFS, LCD_HEIGHT); | 1511 | rb->lcd_bitmap(bubbles_left, 0, 0, XOFS, LCD_HEIGHT); |
1512 | /* skip right border for square screens */ | ||
1513 | #if (LCD_WIDTH > LCD_HEIGHT) | ||
1509 | rb->lcd_bitmap(bubbles_right, XOFS-1+BB_WIDTH*BUBBLE_WIDTH, 0, | 1514 | rb->lcd_bitmap(bubbles_right, XOFS-1+BB_WIDTH*BUBBLE_WIDTH, 0, |
1510 | LCD_WIDTH-(XOFS-1+BB_WIDTH*BUBBLE_WIDTH), LCD_HEIGHT); | 1515 | LCD_WIDTH-(XOFS-1+BB_WIDTH*BUBBLE_WIDTH), LCD_HEIGHT); |
1511 | #endif | 1516 | #endif |
1517 | #endif | ||
1512 | 1518 | ||
1513 | /* display play board */ | 1519 | /* display play board */ |
1514 | for(i=0; i<BB_HEIGHT; i++) { | 1520 | for(i=0; i<BB_HEIGHT; i++) { |
@@ -2523,14 +2529,6 @@ static int bubbles(struct game_context* bb) { | |||
2523 | "UP to fire and show high scores, " | 2529 | "UP to fire and show high scores, " |
2524 | "LEFT/RIGHT to aim and to change level."); | 2530 | "LEFT/RIGHT to aim and to change level."); |
2525 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD | 2531 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD |
2526 | #define BUBBLES_LEFT BUTTON_LEFT | ||
2527 | #define BUBBLES_RIGHT BUTTON_RIGHT | ||
2528 | #define BUBBLES_UP BUTTON_SCROLL_UP | ||
2529 | #define BUBBLES_DOWN BUTTON_SCROLL_DOWN | ||
2530 | #define BUBBLES_QUIT BUTTON_POWER | ||
2531 | #define BUBBLES_START BUTTON_PLAY | ||
2532 | #define BUBBLES_SELECT BUTTON_REW | ||
2533 | #define BUBBLES_RESUME BUTTON_FF | ||
2534 | rb->lcd_puts(0, 2, "PLAY to start/pause"); | 2532 | rb->lcd_puts(0, 2, "PLAY to start/pause"); |
2535 | rb->lcd_puts(0, 3, "FF to save/resume"); | 2533 | rb->lcd_puts(0, 3, "FF to save/resume"); |
2536 | rb->lcd_puts(0, 4, "POWER to exit"); | 2534 | rb->lcd_puts(0, 4, "POWER to exit"); |