Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Bubbles: Fix for gigabeat and add sansa e200 support

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12075 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Adam Boot 2007-01-19 23:03:41 +00:00
parent 841a3c1950
commit 769d6a8255
7 changed files with 38 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/plugins/SOURCES
View file

@ -45,9 +45,7 @@ plasma.c
blackjack.c
bounce.c
#ifndef SANSA_E200
bubbles.c
#endif
#if LCD_WIDTH != 128 && !defined(SANSA_E200)
/* These need adjusting for the iRiver if'p screen */

5
apps/plugins/bitmaps/mono/SOURCES
View file

@ -11,9 +11,10 @@ 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))
((LCD_WIDTH == 176) && (LCD_HEIGHT == 220))
bubbles_bubble.220x176x1.bmp
#elif (LCD_WIDTH == 320) && (LCD_HEIGHT == 240)
#elif ((LCD_WIDTH == 320) && (LCD_HEIGHT == 240)) || \
((LCD_WIDTH == 240) && (LCD_HEIGHT == 320))
bubbles_bubble.320x240x1.bmp
#endif

8
apps/plugins/bitmaps/native/SOURCES
View file

@ -22,14 +22,16 @@ bubbles_right.176x132x16.bmp
bubbles_emblem.220x176x16.bmp
bubbles_left.220x176x16.bmp
bubbles_right.220x176x16.bmp
#elif (LCD_WIDTH == 240) && (LCD_HEIGHT == 320)
#elif (LCD_WIDTH == 176) && (LCD_HEIGHT == 220)
bubbles_emblem.220x176x16.bmp
bubbles_left.240x320x16.bmp
bubbles_right.240x320x16.bmp
bubbles_left.176x220x16.bmp
#elif (LCD_WIDTH == 320) && (LCD_HEIGHT == 240)
bubbles_emblem.320x240x16.bmp
bubbles_left.320x240x16.bmp
bubbles_right.320x240x16.bmp
#elif (LCD_WIDTH == 240) && (LCD_HEIGHT == 320)
bubbles_emblem.320x240x16.bmp
bubbles_left.240x320x16.bmp
#endif
/* ChessBox */

BIN
apps/plugins/bitmaps/native/bubbles_left.176x220x16.bmp Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 31 KiB

BIN
apps/plugins/bitmaps/native/bubbles_left.240x320x16.bmp
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 53 KiB

After

Width:  |  Height:  |  Size: 60 KiB

BIN
apps/plugins/bitmaps/native/bubbles_right.240x320x16.bmp
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 54 KiB

41
apps/plugins/bubbles.c
View file

@ -59,10 +59,10 @@ PLUGIN_HEADER
#define BUBBLES_LEFT_REP PLA_LEFT_REPEAT
#define BUBBLES_RIGHT PLA_RIGHT
#define BUBBLES_RIGHT_REP PLA_RIGHT_REPEAT
#define BUBBLES_QUIT PLA_QUIT
#define BUBBLES_START PLA_START
#define BUBBLES_SELECT PLA_FIRE
#define BUBBLES_RESUME PLA_MENU
#define BUBBLES_QUIT PLA_QUIT
#define BUBBLES_START PLA_START
#define BUBBLES_SELECT PLA_FIRE
#define BUBBLES_RESUME PLA_MENU
#if CONFIG_KEYPAD != ONDIO_PAD
@ -81,8 +81,8 @@ PLUGIN_HEADER
#endif
/* bubbles will consume height of 10*ROW_HEIGHT+2*(BUBBLE_HEIGHT-1)+BUBBLE_HEIGHT/2 */
/* 24x24 bubbles (iPod Video) */
/* bubbles will consume height of ROW_HEIGHT*(BB_HEIGHT-1)+BUBBLE_HEIGHT*3/2 */
/* 22x22 bubbles (iPod Video) */
#if (LCD_HEIGHT == 240) && (LCD_WIDTH == 320)
#define BUBBLE_WIDTH 22
#define BUBBLE_HEIGHT 22
@ -93,6 +93,17 @@ PLUGIN_HEADER
#define ROW_INDENT 11
#define MAX_FPS 40
/* 22x22 bubbles (Gigabeat) */
#elif (LCD_HEIGHT == 320) && (LCD_WIDTH == 240)
#define BUBBLE_WIDTH 22
#define BUBBLE_HEIGHT 22
#define EMBLEM_WIDTH 16
#define EMBLEM_HEIGHT 16
#define XOFS 64
#define ROW_HEIGHT 18
#define ROW_INDENT 11
#define MAX_FPS 20
/* 16x16 bubbles (H300, iPod Color) */
#elif (LCD_HEIGHT == 176) && (LCD_WIDTH == 220)
#define BUBBLE_WIDTH 16
@ -104,18 +115,18 @@ PLUGIN_HEADER
#define ROW_INDENT 8
#define MAX_FPS 30
/* 16x16 bubbles (Gigabeat) */
#elif (LCD_HEIGHT == 320) && (LCD_WIDTH == 240)
/* 16x16 bubbles (Sansa E200) */
#elif (LCD_HEIGHT == 220) && (LCD_WIDTH == 176)
#define BUBBLE_WIDTH 16
#define BUBBLE_HEIGHT 16
#define EMBLEM_WIDTH 12
#define EMBLEM_HEIGHT 12
#define XOFS 56
#define XOFS 48
#define ROW_HEIGHT 14
#define ROW_INDENT 8
#define MAX_FPS 20
#define MAX_FPS 30
/* 12x12 bubbles (iPod Nano) */
/* 12x12 bubbles (iPod Nano, Sansa E200) */
#elif (LCD_HEIGHT == 132) && (LCD_WIDTH == 176)
#define BUBBLE_WIDTH 12
#define BUBBLE_HEIGHT 12
@ -2491,6 +2502,14 @@ static int bubbles(struct game_context* bb) {
rb->lcd_puts(0, 6, " and show high scores");
rb->lcd_puts(0, 7, "LEFT/RIGHT to aim");
rb->lcd_puts(0, 8, "UP/DOWN to change level");
#elif CONFIG_KEYPAD == SANSA_E200_PAD
rb->lcd_puts(0, 2, "PLAY to start/pause");
rb->lcd_puts(0, 3, "SUBMENU to save/resume");
rb->lcd_puts(0, 4, "POWER to exit");
rb->lcd_puts(0, 5, "SELECT to fire");
rb->lcd_puts(0, 6, " and show high scores");
rb->lcd_puts(0, 7, "LEFT/RIGHT to aim");
rb->lcd_puts(0, 8, "SCROLL to change level");
#endif
#if LCD_WIDTH >= 138
rb->snprintf(str, 28, "Start on level %d of %d", startlevel+1,