nihilazo
/
rockbox
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bubbles adapted to H10-5GB by Marianne Arnold. 

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10997 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jens Arnold 2006-09-18 21:21:12 +00:00
parent 10ad0a2a94
commit f3dd56791a
4 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/plugins/SOURCES
View File

@ -35,10 +35,9 @@ mandelbrot.c
plasma.c
bounce.c
#ifndef IRIVER_H10_5GB
bubbles.c
#endif
#if LCD_WIDTH != 128
#if LCD_WIDTH != 128
/* These need adjusting for the iRiver if'p screen */
brickmania.c
#endif

3
apps/plugins/bitmaps/mono/SOURCES
View File

@ -3,7 +3,8 @@
/* Bubbles */
#if (LCD_WIDTH == 112) && (LCD_HEIGHT == 64)
bubbles_bubble.112x64x1.bmp
#elif (LCD_WIDTH == 160) && (LCD_HEIGHT == 128)
#elif ((LCD_WIDTH == 160) && (LCD_HEIGHT == 128)) || \
((LCD_WIDTH == 128) && (LCD_HEIGHT == 128))
bubbles_bubble.160x128x1.bmp
#elif (LCD_WIDTH == 176) && (LCD_HEIGHT == 132)
bubbles_bubble.160x128x1.bmp

3
apps/plugins/bitmaps/native/SOURCES
View File

@ -11,6 +11,9 @@ bubbles_emblem.160x128x2.bmp
bubbles_emblem.160x128x16.bmp
bubbles_left.160x128x16.bmp
bubbles_right.160x128x16.bmp
#elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 128)
bubbles_emblem.160x128x16.bmp
bubbles_left.160x128x16.bmp
#elif (LCD_WIDTH == 176) && (LCD_HEIGHT == 132)
bubbles_emblem.160x128x16.bmp
bubbles_left.176x132x16.bmp

20
apps/plugins/bubbles.c
View File

@ -175,8 +175,8 @@ PLUGIN_HEADER
#define ROW_INDENT 6
#define MAX_FPS 40
/* 12x12 bubbles (H100, iAudio X5, iPod 3G, iPod 4G grayscale) */
#elif (LCD_HEIGHT == 128) && (LCD_WIDTH == 160)
/* 12x12 bubbles (H100, H10, iAudio X5, iPod 3G, iPod 4G grayscale) */
#elif (LCD_HEIGHT == 128) && ((LCD_WIDTH == 160) || (LCD_WIDTH == 128))
#define BUBBLE_WIDTH 12
#define BUBBLE_HEIGHT 12
#define EMBLEM_WIDTH 8
@ -224,10 +224,13 @@ PLUGIN_HEADER
/* external bitmaps */
extern const fb_data bubbles_bubble[];
extern const fb_data bubbles_emblem[];
#ifdef HAVE_LCD_COLOR
#ifdef HAVE_LCD_COLOR
extern const fb_data bubbles_left[];
/* skip right border for square screens */
#if (LCD_WIDTH > LCD_HEIGHT)
extern const fb_data bubbles_right[];
#endif
#endif
/* global rockbox api */
static struct plugin_api* rb;
@ -1506,8 +1509,11 @@ static void bubbles_drawboard(struct game_context* bb) {
/* draw sidebars */
#ifdef HAVE_LCD_COLOR
rb->lcd_bitmap(bubbles_left, 0, 0, XOFS, LCD_HEIGHT);
/* skip right border for square screens */
#if (LCD_WIDTH > LCD_HEIGHT)
rb->lcd_bitmap(bubbles_right, XOFS-1+BB_WIDTH*BUBBLE_WIDTH, 0,
LCD_WIDTH-(XOFS-1+BB_WIDTH*BUBBLE_WIDTH), LCD_HEIGHT);
#endif
#endif
/* display play board */
@ -2523,14 +2529,6 @@ static int bubbles(struct game_context* bb) {
"UP to fire and show high scores, "
"LEFT/RIGHT to aim and to change level.");
#elif CONFIG_KEYPAD == IRIVER_H10_PAD
#define BUBBLES_LEFT BUTTON_LEFT
#define BUBBLES_RIGHT BUTTON_RIGHT
#define BUBBLES_UP BUTTON_SCROLL_UP
#define BUBBLES_DOWN BUTTON_SCROLL_DOWN
#define BUBBLES_QUIT BUTTON_POWER
#define BUBBLES_START BUTTON_PLAY
#define BUBBLES_SELECT BUTTON_REW
#define BUBBLES_RESUME BUTTON_FF
rb->lcd_puts(0, 2, "PLAY to start/pause");
rb->lcd_puts(0, 3, "FF to save/resume");
rb->lcd_puts(0, 4, "POWER to exit");