diff options
-rw-r--r-- | apps/plugins/bitmaps/native/SOURCES | 2 | ||||
-rw-r--r-- | apps/plugins/bitmaps/native/bubbles_background.96x96x16.bmp | bin | 0 -> 27702 bytes | |||
-rw-r--r-- | apps/plugins/bubbles.c | 26 |
3 files changed, 25 insertions, 3 deletions
diff --git a/apps/plugins/bitmaps/native/SOURCES b/apps/plugins/bitmaps/native/SOURCES index a523405552..de347fd1aa 100644 --- a/apps/plugins/bitmaps/native/SOURCES +++ b/apps/plugins/bitmaps/native/SOURCES | |||
@@ -151,7 +151,7 @@ bubbles_emblem.132x80x16.bmp | |||
151 | bubbles_background.132x80x16.bmp | 151 | bubbles_background.132x80x16.bmp |
152 | #elif (LCD_WIDTH >= 96) && (LCD_HEIGHT >= 96) | 152 | #elif (LCD_WIDTH >= 96) && (LCD_HEIGHT >= 96) |
153 | bubbles_emblem.132x80x16.bmp | 153 | bubbles_emblem.132x80x16.bmp |
154 | bubbles_background.128x96x16.bmp | 154 | bubbles_background.96x96x16.bmp |
155 | #endif | 155 | #endif |
156 | #elif LCD_DEPTH <= 2 /* greyscale, mono */ | 156 | #elif LCD_DEPTH <= 2 /* greyscale, mono */ |
157 | #if (LCD_WIDTH >= 160) && (LCD_HEIGHT >= 128) | 157 | #if (LCD_WIDTH >= 160) && (LCD_HEIGHT >= 128) |
diff --git a/apps/plugins/bitmaps/native/bubbles_background.96x96x16.bmp b/apps/plugins/bitmaps/native/bubbles_background.96x96x16.bmp new file mode 100644 index 0000000000..f52642e19b --- /dev/null +++ b/apps/plugins/bitmaps/native/bubbles_background.96x96x16.bmp | |||
Binary files differ | |||
diff --git a/apps/plugins/bubbles.c b/apps/plugins/bubbles.c index 9f860d43ee..eef4f4dc19 100644 --- a/apps/plugins/bubbles.c +++ b/apps/plugins/bubbles.c | |||
@@ -198,7 +198,7 @@ enum { | |||
198 | #define MAX_FPS 30 | 198 | #define MAX_FPS 30 |
199 | 199 | ||
200 | /* 7x7 bubbles (Sansa Clip/m200) */ | 200 | /* 7x7 bubbles (Sansa Clip/m200) */ |
201 | #elif (LCD_HEIGHT == 64 && LCD_WIDTH == 128) || (LCD_HEIGHT == 96 && LCD_WIDTH == 96) | 201 | #elif (LCD_HEIGHT == 64 && LCD_WIDTH == 128) |
202 | #define XOFS 33 | 202 | #define XOFS 33 |
203 | #define ROW_HEIGHT 5 | 203 | #define ROW_HEIGHT 5 |
204 | #define MAX_FPS 30 | 204 | #define MAX_FPS 30 |
@@ -209,6 +209,23 @@ enum { | |||
209 | #define ROW_HEIGHT 5 | 209 | #define ROW_HEIGHT 5 |
210 | #define MAX_FPS 20 | 210 | #define MAX_FPS 20 |
211 | 211 | ||
212 | /* 7x7 bubbles (Sansa Clip Zip) */ | ||
213 | #elif (LCD_HEIGHT == 96 && LCD_WIDTH == 96) | ||
214 | #define XOFS 33 | ||
215 | #define ROW_HEIGHT 5 | ||
216 | #define MAX_FPS 30 | ||
217 | |||
218 | /* custom text positioning */ | ||
219 | #define LEVEL_TXT_X 1 | ||
220 | #define LEVEL_TXT_WIDTH 31 | ||
221 | #define LEVEL_TXT_Y 4 | ||
222 | #define SCORE_TXT_X 1 | ||
223 | #define SCORE_TXT_WIDTH 31 | ||
224 | #define SCORE_TXT_Y 31 | ||
225 | #define NEXT_BB_X 1 | ||
226 | #define NEXT_BB_WIDTH 31 | ||
227 | #define NEXT_BB_Y 72 | ||
228 | |||
212 | #else | 229 | #else |
213 | #error BUBBLES: Unsupported LCD type | 230 | #error BUBBLES: Unsupported LCD type |
214 | #endif | 231 | #endif |
@@ -1570,7 +1587,12 @@ static void bubbles_drawboard(struct game_context* bb) { | |||
1570 | 1587 | ||
1571 | if(bb->elapsedshot >= (MAX_SHOTTIME*7)/10) { | 1588 | if(bb->elapsedshot >= (MAX_SHOTTIME*7)/10) { |
1572 | rb->lcd_getstringsize(hurry, &w1, &h); | 1589 | rb->lcd_getstringsize(hurry, &w1, &h); |
1573 | rb->lcd_putsxy(LCD_WIDTH/2-w1/2, LCD_HEIGHT/2-h/2, hurry); | 1590 | /* screen is too small for the message to be centered (Clip Zip) */ |
1591 | #if (LCD_WIDTH <= 96) | ||
1592 | rb->lcd_putsxy(LCD_WIDTH/2-w1/2+LCD_WIDTH/6, LCD_HEIGHT/2-h/2, hurry); | ||
1593 | #else | ||
1594 | rb->lcd_putsxy(LCD_WIDTH/2-w1/2, LCD_HEIGHT/2-h/2, hurry); | ||
1595 | #endif | ||
1574 | } | 1596 | } |
1575 | } | 1597 | } |
1576 | 1598 | ||