Permalink
Browse files

Sansa Clip Zip: Bubble now shows a proper background image

Change-Id: If595378d58a4602bdc6b101c062c6974f6debf62
Reviewed-on: http://gerrit.rockbox.org/167
Reviewed-by: Dimitar Dimitrov <mitakas@gmail.com>
Tested-by: Dimitar Dimitrov <mitakas@gmail.com>
Tested-by: Bertrik Sikken <bertrik@sikken.nl>
Reviewed-by: Bertrik Sikken <bertrik@sikken.nl>
Reviewed-by: Rafaël Carré <rafael.carre@gmail.com>
  • Loading branch information...
1 parent 57264ce commit 3f82f3aca14eb954e55f761721ffdd2684f0e812 @mitakas mitakas committed with funman Mar 2, 2012
@@ -151,7 +151,7 @@ bubbles_emblem.132x80x16.bmp
bubbles_background.132x80x16.bmp
#elif (LCD_WIDTH >= 96) && (LCD_HEIGHT >= 96)
bubbles_emblem.132x80x16.bmp
-bubbles_background.128x96x16.bmp
+bubbles_background.96x96x16.bmp
#endif
#elif LCD_DEPTH <= 2 /* greyscale, mono */
#if (LCD_WIDTH >= 160) && (LCD_HEIGHT >= 128)
Binary file not shown.
View
@@ -198,7 +198,7 @@ enum {
#define MAX_FPS 30
/* 7x7 bubbles (Sansa Clip/m200) */
-#elif (LCD_HEIGHT == 64 && LCD_WIDTH == 128) || (LCD_HEIGHT == 96 && LCD_WIDTH == 96)
+#elif (LCD_HEIGHT == 64 && LCD_WIDTH == 128)
#define XOFS 33
#define ROW_HEIGHT 5
#define MAX_FPS 30
@@ -209,6 +209,23 @@ enum {
#define ROW_HEIGHT 5
#define MAX_FPS 20
+/* 7x7 bubbles (Sansa Clip Zip) */
+#elif (LCD_HEIGHT == 96 && LCD_WIDTH == 96)
+#define XOFS 33
+#define ROW_HEIGHT 5
+#define MAX_FPS 30
+
+/* custom text positioning */
+#define LEVEL_TXT_X 1
+#define LEVEL_TXT_WIDTH 31
+#define LEVEL_TXT_Y 4
+#define SCORE_TXT_X 1
+#define SCORE_TXT_WIDTH 31
+#define SCORE_TXT_Y 31
+#define NEXT_BB_X 1
+#define NEXT_BB_WIDTH 31
+#define NEXT_BB_Y 72
+
#else
#error BUBBLES: Unsupported LCD type
#endif
@@ -1570,7 +1587,12 @@ static void bubbles_drawboard(struct game_context* bb) {
if(bb->elapsedshot >= (MAX_SHOTTIME*7)/10) {
rb->lcd_getstringsize(hurry, &w1, &h);
- rb->lcd_putsxy(LCD_WIDTH/2-w1/2, LCD_HEIGHT/2-h/2, hurry);
+ /* screen is too small for the message to be centered (Clip Zip) */
+ #if (LCD_WIDTH <= 96)
+ rb->lcd_putsxy(LCD_WIDTH/2-w1/2+LCD_WIDTH/6, LCD_HEIGHT/2-h/2, hurry);
+ #else
+ rb->lcd_putsxy(LCD_WIDTH/2-w1/2, LCD_HEIGHT/2-h/2, hurry);
+ #endif
}
}

0 comments on commit 3f82f3a

Please sign in to comment.