diff options
author | Marianne Arnold <pixelma@rockbox.org> | 2007-09-28 21:16:35 +0000 |
---|---|---|
committer | Marianne Arnold <pixelma@rockbox.org> | 2007-09-28 21:16:35 +0000 |
commit | 7cbc161d517eb9bfbd2a251d82f62b07c1752168 (patch) | |
tree | 9a11bb0a4ab2e67628d27f1b6d5d93f58064b07e /apps/plugins/bubbles.c | |
parent | c0e34fad91d4b17e8d419a6cc9669c9d8b9b7537 (diff) | |
download | rockbox-7cbc161d517eb9bfbd2a251d82f62b07c1752168.tar.gz rockbox-7cbc161d517eb9bfbd2a251d82f62b07c1752168.zip |
Make bubbles use one background picture that is the size of the display instead of combining a 'left' and sometimes a 'right' bmp. This way it's clearer how the background is generated and adapting to new display sizes should be easier.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14893 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins/bubbles.c')
-rw-r--r-- | apps/plugins/bubbles.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/apps/plugins/bubbles.c b/apps/plugins/bubbles.c index 4d49c3fc14..812a88fb10 100644 --- a/apps/plugins/bubbles.c +++ b/apps/plugins/bubbles.c | |||
@@ -202,11 +202,7 @@ PLUGIN_HEADER | |||
202 | extern const fb_data bubbles_bubble[]; | 202 | extern const fb_data bubbles_bubble[]; |
203 | extern const fb_data bubbles_emblem[]; | 203 | extern const fb_data bubbles_emblem[]; |
204 | #ifdef HAVE_LCD_COLOR | 204 | #ifdef HAVE_LCD_COLOR |
205 | extern const fb_data bubbles_left[]; | 205 | extern const fb_data bubbles_background[]; |
206 | /* skip right border for square screens */ | ||
207 | #if (LCD_WIDTH > LCD_HEIGHT) | ||
208 | extern const fb_data bubbles_right[]; | ||
209 | #endif | ||
210 | #endif | 206 | #endif |
211 | 207 | ||
212 | /* global rockbox api */ | 208 | /* global rockbox api */ |
@@ -1418,14 +1414,9 @@ static void bubbles_drawboard(struct game_context* bb) { | |||
1418 | /* clear screen */ | 1414 | /* clear screen */ |
1419 | rb->lcd_clear_display(); | 1415 | rb->lcd_clear_display(); |
1420 | 1416 | ||
1421 | /* draw sidebars */ | 1417 | /* draw background */ |
1422 | #ifdef HAVE_LCD_COLOR | 1418 | #ifdef HAVE_LCD_COLOR |
1423 | rb->lcd_bitmap(bubbles_left, 0, 0, XOFS, LCD_HEIGHT); | 1419 | rb->lcd_bitmap(bubbles_background, 0, 0, LCD_WIDTH, LCD_HEIGHT); |
1424 | /* skip right border for square screens */ | ||
1425 | #if (LCD_WIDTH > LCD_HEIGHT) | ||
1426 | rb->lcd_bitmap(bubbles_right, XOFS-1+BB_WIDTH*BUBBLE_WIDTH, 0, | ||
1427 | LCD_WIDTH-(XOFS-1+BB_WIDTH*BUBBLE_WIDTH), LCD_HEIGHT); | ||
1428 | #endif | ||
1429 | #endif | 1420 | #endif |
1430 | 1421 | ||
1431 | /* display play board */ | 1422 | /* display play board */ |