diff options
Diffstat (limited to 'apps/plugins')
-rw-r--r-- | apps/plugins/SOURCES | 2 | ||||
-rw-r--r-- | apps/plugins/bitmaps/mono/SOURCES | 5 | ||||
-rw-r--r-- | apps/plugins/bitmaps/native/SOURCES | 8 | ||||
-rwxr-xr-x | apps/plugins/bitmaps/native/bubbles_left.176x220x16.bmp | bin | 0 -> 31734 bytes | |||
-rw-r--r-- | apps/plugins/bitmaps/native/bubbles_left.240x320x16.bmp | bin | 53814 -> 61494 bytes | |||
-rw-r--r-- | apps/plugins/bitmaps/native/bubbles_right.240x320x16.bmp | bin | 55094 -> 0 bytes | |||
-rw-r--r-- | apps/plugins/bubbles.c | 41 |
7 files changed, 38 insertions, 18 deletions
diff --git a/apps/plugins/SOURCES b/apps/plugins/SOURCES index ffa01f1f77..d22b3af423 100644 --- a/apps/plugins/SOURCES +++ b/apps/plugins/SOURCES | |||
@@ -45,9 +45,7 @@ plasma.c | |||
45 | 45 | ||
46 | blackjack.c | 46 | blackjack.c |
47 | bounce.c | 47 | bounce.c |
48 | #ifndef SANSA_E200 | ||
49 | bubbles.c | 48 | bubbles.c |
50 | #endif | ||
51 | 49 | ||
52 | #if LCD_WIDTH != 128 && !defined(SANSA_E200) | 50 | #if LCD_WIDTH != 128 && !defined(SANSA_E200) |
53 | /* These need adjusting for the iRiver if'p screen */ | 51 | /* These need adjusting for the iRiver if'p screen */ |
diff --git a/apps/plugins/bitmaps/mono/SOURCES b/apps/plugins/bitmaps/mono/SOURCES index c5c26cdc0b..6c8218de77 100644 --- a/apps/plugins/bitmaps/mono/SOURCES +++ b/apps/plugins/bitmaps/mono/SOURCES | |||
@@ -11,9 +11,10 @@ bubbles_bubble.160x128x1.bmp | |||
11 | #elif (LCD_WIDTH == 138) && (LCD_HEIGHT == 110) | 11 | #elif (LCD_WIDTH == 138) && (LCD_HEIGHT == 110) |
12 | bubbles_bubble.138x110x1.bmp | 12 | bubbles_bubble.138x110x1.bmp |
13 | #elif ((LCD_WIDTH == 220) && (LCD_HEIGHT == 176)) || \ | 13 | #elif ((LCD_WIDTH == 220) && (LCD_HEIGHT == 176)) || \ |
14 | ((LCD_WIDTH == 240) && (LCD_HEIGHT == 320)) | 14 | ((LCD_WIDTH == 176) && (LCD_HEIGHT == 220)) |
15 | bubbles_bubble.220x176x1.bmp | 15 | bubbles_bubble.220x176x1.bmp |
16 | #elif (LCD_WIDTH == 320) && (LCD_HEIGHT == 240) | 16 | #elif ((LCD_WIDTH == 320) && (LCD_HEIGHT == 240)) || \ |
17 | ((LCD_WIDTH == 240) && (LCD_HEIGHT == 320)) | ||
17 | bubbles_bubble.320x240x1.bmp | 18 | bubbles_bubble.320x240x1.bmp |
18 | #endif | 19 | #endif |
19 | 20 | ||
diff --git a/apps/plugins/bitmaps/native/SOURCES b/apps/plugins/bitmaps/native/SOURCES index b98377e846..6fb8a20e71 100644 --- a/apps/plugins/bitmaps/native/SOURCES +++ b/apps/plugins/bitmaps/native/SOURCES | |||
@@ -22,14 +22,16 @@ bubbles_right.176x132x16.bmp | |||
22 | bubbles_emblem.220x176x16.bmp | 22 | bubbles_emblem.220x176x16.bmp |
23 | bubbles_left.220x176x16.bmp | 23 | bubbles_left.220x176x16.bmp |
24 | bubbles_right.220x176x16.bmp | 24 | bubbles_right.220x176x16.bmp |
25 | #elif (LCD_WIDTH == 240) && (LCD_HEIGHT == 320) | 25 | #elif (LCD_WIDTH == 176) && (LCD_HEIGHT == 220) |
26 | bubbles_emblem.220x176x16.bmp | 26 | bubbles_emblem.220x176x16.bmp |
27 | bubbles_left.240x320x16.bmp | 27 | bubbles_left.176x220x16.bmp |
28 | bubbles_right.240x320x16.bmp | ||
29 | #elif (LCD_WIDTH == 320) && (LCD_HEIGHT == 240) | 28 | #elif (LCD_WIDTH == 320) && (LCD_HEIGHT == 240) |
30 | bubbles_emblem.320x240x16.bmp | 29 | bubbles_emblem.320x240x16.bmp |
31 | bubbles_left.320x240x16.bmp | 30 | bubbles_left.320x240x16.bmp |
32 | bubbles_right.320x240x16.bmp | 31 | bubbles_right.320x240x16.bmp |
32 | #elif (LCD_WIDTH == 240) && (LCD_HEIGHT == 320) | ||
33 | bubbles_emblem.320x240x16.bmp | ||
34 | bubbles_left.240x320x16.bmp | ||
33 | #endif | 35 | #endif |
34 | 36 | ||
35 | /* ChessBox */ | 37 | /* ChessBox */ |
diff --git a/apps/plugins/bitmaps/native/bubbles_left.176x220x16.bmp b/apps/plugins/bitmaps/native/bubbles_left.176x220x16.bmp new file mode 100755 index 0000000000..7d66663a0a --- /dev/null +++ b/apps/plugins/bitmaps/native/bubbles_left.176x220x16.bmp | |||
Binary files differ | |||
diff --git a/apps/plugins/bitmaps/native/bubbles_left.240x320x16.bmp b/apps/plugins/bitmaps/native/bubbles_left.240x320x16.bmp index 25cf12ddbf..6e4bb4533e 100644 --- a/apps/plugins/bitmaps/native/bubbles_left.240x320x16.bmp +++ b/apps/plugins/bitmaps/native/bubbles_left.240x320x16.bmp | |||
Binary files differ | |||
diff --git a/apps/plugins/bitmaps/native/bubbles_right.240x320x16.bmp b/apps/plugins/bitmaps/native/bubbles_right.240x320x16.bmp deleted file mode 100644 index 7f08389cc0..0000000000 --- a/apps/plugins/bitmaps/native/bubbles_right.240x320x16.bmp +++ /dev/null | |||
Binary files differ | |||
diff --git a/apps/plugins/bubbles.c b/apps/plugins/bubbles.c index 2ff145b5f7..f3a03cbd7b 100644 --- a/apps/plugins/bubbles.c +++ b/apps/plugins/bubbles.c | |||
@@ -59,10 +59,10 @@ PLUGIN_HEADER | |||
59 | #define BUBBLES_LEFT_REP PLA_LEFT_REPEAT | 59 | #define BUBBLES_LEFT_REP PLA_LEFT_REPEAT |
60 | #define BUBBLES_RIGHT PLA_RIGHT | 60 | #define BUBBLES_RIGHT PLA_RIGHT |
61 | #define BUBBLES_RIGHT_REP PLA_RIGHT_REPEAT | 61 | #define BUBBLES_RIGHT_REP PLA_RIGHT_REPEAT |
62 | #define BUBBLES_QUIT PLA_QUIT | 62 | #define BUBBLES_QUIT PLA_QUIT |
63 | #define BUBBLES_START PLA_START | 63 | #define BUBBLES_START PLA_START |
64 | #define BUBBLES_SELECT PLA_FIRE | 64 | #define BUBBLES_SELECT PLA_FIRE |
65 | #define BUBBLES_RESUME PLA_MENU | 65 | #define BUBBLES_RESUME PLA_MENU |
66 | 66 | ||
67 | #if CONFIG_KEYPAD != ONDIO_PAD | 67 | #if CONFIG_KEYPAD != ONDIO_PAD |
68 | 68 | ||
@@ -81,8 +81,8 @@ PLUGIN_HEADER | |||
81 | #endif | 81 | #endif |
82 | 82 | ||
83 | 83 | ||
84 | /* bubbles will consume height of 10*ROW_HEIGHT+2*(BUBBLE_HEIGHT-1)+BUBBLE_HEIGHT/2 */ | 84 | /* bubbles will consume height of ROW_HEIGHT*(BB_HEIGHT-1)+BUBBLE_HEIGHT*3/2 */ |
85 | /* 24x24 bubbles (iPod Video) */ | 85 | /* 22x22 bubbles (iPod Video) */ |
86 | #if (LCD_HEIGHT == 240) && (LCD_WIDTH == 320) | 86 | #if (LCD_HEIGHT == 240) && (LCD_WIDTH == 320) |
87 | #define BUBBLE_WIDTH 22 | 87 | #define BUBBLE_WIDTH 22 |
88 | #define BUBBLE_HEIGHT 22 | 88 | #define BUBBLE_HEIGHT 22 |
@@ -93,6 +93,17 @@ PLUGIN_HEADER | |||
93 | #define ROW_INDENT 11 | 93 | #define ROW_INDENT 11 |
94 | #define MAX_FPS 40 | 94 | #define MAX_FPS 40 |
95 | 95 | ||
96 | /* 22x22 bubbles (Gigabeat) */ | ||
97 | #elif (LCD_HEIGHT == 320) && (LCD_WIDTH == 240) | ||
98 | #define BUBBLE_WIDTH 22 | ||
99 | #define BUBBLE_HEIGHT 22 | ||
100 | #define EMBLEM_WIDTH 16 | ||
101 | #define EMBLEM_HEIGHT 16 | ||
102 | #define XOFS 64 | ||
103 | #define ROW_HEIGHT 18 | ||
104 | #define ROW_INDENT 11 | ||
105 | #define MAX_FPS 20 | ||
106 | |||
96 | /* 16x16 bubbles (H300, iPod Color) */ | 107 | /* 16x16 bubbles (H300, iPod Color) */ |
97 | #elif (LCD_HEIGHT == 176) && (LCD_WIDTH == 220) | 108 | #elif (LCD_HEIGHT == 176) && (LCD_WIDTH == 220) |
98 | #define BUBBLE_WIDTH 16 | 109 | #define BUBBLE_WIDTH 16 |
@@ -104,18 +115,18 @@ PLUGIN_HEADER | |||
104 | #define ROW_INDENT 8 | 115 | #define ROW_INDENT 8 |
105 | #define MAX_FPS 30 | 116 | #define MAX_FPS 30 |
106 | 117 | ||
107 | /* 16x16 bubbles (Gigabeat) */ | 118 | /* 16x16 bubbles (Sansa E200) */ |
108 | #elif (LCD_HEIGHT == 320) && (LCD_WIDTH == 240) | 119 | #elif (LCD_HEIGHT == 220) && (LCD_WIDTH == 176) |
109 | #define BUBBLE_WIDTH 16 | 120 | #define BUBBLE_WIDTH 16 |
110 | #define BUBBLE_HEIGHT 16 | 121 | #define BUBBLE_HEIGHT 16 |
111 | #define EMBLEM_WIDTH 12 | 122 | #define EMBLEM_WIDTH 12 |
112 | #define EMBLEM_HEIGHT 12 | 123 | #define EMBLEM_HEIGHT 12 |
113 | #define XOFS 56 | 124 | #define XOFS 48 |
114 | #define ROW_HEIGHT 14 | 125 | #define ROW_HEIGHT 14 |
115 | #define ROW_INDENT 8 | 126 | #define ROW_INDENT 8 |
116 | #define MAX_FPS 20 | 127 | #define MAX_FPS 30 |
117 | 128 | ||
118 | /* 12x12 bubbles (iPod Nano) */ | 129 | /* 12x12 bubbles (iPod Nano, Sansa E200) */ |
119 | #elif (LCD_HEIGHT == 132) && (LCD_WIDTH == 176) | 130 | #elif (LCD_HEIGHT == 132) && (LCD_WIDTH == 176) |
120 | #define BUBBLE_WIDTH 12 | 131 | #define BUBBLE_WIDTH 12 |
121 | #define BUBBLE_HEIGHT 12 | 132 | #define BUBBLE_HEIGHT 12 |
@@ -2491,6 +2502,14 @@ static int bubbles(struct game_context* bb) { | |||
2491 | rb->lcd_puts(0, 6, " and show high scores"); | 2502 | rb->lcd_puts(0, 6, " and show high scores"); |
2492 | rb->lcd_puts(0, 7, "LEFT/RIGHT to aim"); | 2503 | rb->lcd_puts(0, 7, "LEFT/RIGHT to aim"); |
2493 | rb->lcd_puts(0, 8, "UP/DOWN to change level"); | 2504 | rb->lcd_puts(0, 8, "UP/DOWN to change level"); |
2505 | #elif CONFIG_KEYPAD == SANSA_E200_PAD | ||
2506 | rb->lcd_puts(0, 2, "PLAY to start/pause"); | ||
2507 | rb->lcd_puts(0, 3, "SUBMENU to save/resume"); | ||
2508 | rb->lcd_puts(0, 4, "POWER to exit"); | ||
2509 | rb->lcd_puts(0, 5, "SELECT to fire"); | ||
2510 | rb->lcd_puts(0, 6, " and show high scores"); | ||
2511 | rb->lcd_puts(0, 7, "LEFT/RIGHT to aim"); | ||
2512 | rb->lcd_puts(0, 8, "SCROLL to change level"); | ||
2494 | #endif | 2513 | #endif |
2495 | #if LCD_WIDTH >= 138 | 2514 | #if LCD_WIDTH >= 138 |
2496 | rb->snprintf(str, 28, "Start on level %d of %d", startlevel+1, | 2515 | rb->snprintf(str, 28, "Start on level %d of %d", startlevel+1, |