Brickmania for Sansa c200 and the small H10 with new graphics. While at it reduce the number of necessary per screen definition by letting the plugin retrieve the bitmap heights and widths from the file, therefore 'clean up' some graphics e.g. the menu items one, also make some backgrounds a bit nicer. Rearrange bitmaps/native/SOURCES and rename some graphics to reduce the number of duplicated bitmaps which only had a different name e.g. the ball - and tweak the gameover bitmap (on colour displays it uses transparency, and adapt the already existing mono bitmap to be usable). There might be minor differences in the 'looks' for existing ports but almost not noticeable with the exception that the gameover graphic is now centered. Introduce an alternative left and right key for c200 (volume up/down) for easier control. Manual update will follow.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15981 a1c6a512-1295-4272-9138-f99709370657

36 files changed, 57 insertions, 45 deletions

diff --git a/apps/plugins/bitmaps/mono/SOURCES b/apps/plugins/bitmaps/mono/SOURCES
index 3917828bba..36fd2b02b0 100644
--- a/apps/plugins/bitmaps/mono/SOURCES
+++ b/apps/plugins/bitmaps/mono/SOURCES
@@ -20,16 +20,6 @@ bubbles_bubble.220x176x1.bmp
 bubbles_bubble.320x240x1.bmp
 #endif
 
-/* BrickMania */
-#if (LCD_WIDTH == 112) && (LCD_HEIGHT == 64)
-brickmania_menu_items.112x64x1.bmp
-brickmania_bricks.112x64x1.bmp
-brickmania_ball.112x64x1.bmp
-brickmania_pads.112x64x1.bmp
-brickmania_powerups.112x64x1.bmp
-
-#endif
-
 /* Rockblox */
 #if (LCD_WIDTH == 112) && (LCD_HEIGHT == 64)
 rockblox_background.112x64x1.bmp
diff --git a/apps/plugins/bitmaps/mono/brickmania_gameover.112x64x1.bmp b/apps/plugins/bitmaps/mono/brickmania_gameover.112x64x1.bmp
deleted file mode 100644
index 73afc2bfbb..0000000000
--- a/apps/plugins/bitmaps/mono/brickmania_gameover.112x64x1.bmp
+++ /dev/null
diff --git a/apps/plugins/bitmaps/mono/brickmania_menu_items.112x64x1.bmp b/apps/plugins/bitmaps/mono/brickmania_menu_items.112x64x1.bmp
deleted file mode 100644
index 0403c9ae95..0000000000
--- a/apps/plugins/bitmaps/mono/brickmania_menu_items.112x64x1.bmp
+++ /dev/null
diff --git a/apps/plugins/bitmaps/native/SOURCES b/apps/plugins/bitmaps/native/SOURCES
index 35bd6ad69e..61c9b7a70f 100644
--- a/apps/plugins/bitmaps/native/SOURCES
+++ b/apps/plugins/bitmaps/native/SOURCES
@@ -1,59 +1,81 @@
 #ifdef HAVE_LCD_BITMAP
 
 /* Brickmania */
-#if (LCD_WIDTH >= 220) && (LCD_HEIGHT >= 176) && (LCD_DEPTH == 16)
-#if (LCD_WIDTH == 320)
+#ifdef HAVE_LCD_COLOR
+brickmania_gameover.112x54x16.bmp
+#if LCD_WIDTH >= 220 /* common to all big lcds */
+brickmania_ball.5x5x16.bmp
+brickmania_menu_items.220x176x16.bmp
+#if LCD_WIDTH >= 320 /* Ipod Video */
 brickmania_menu_bg.320x240x16.bmp
 brickmania_bricks.320x240x16.bmp
 brickmania_pads.320x240x16.bmp
 brickmania_break.320x240x16.bmp
 brickmania_powerups.320x240x16.bmp
 #else
-#if (LCD_WIDTH == 240) && (LCD_HEIGHT == 320)
-brickmania_menu_bg.240x320x16.bmp
-#else
-brickmania_menu_bg.220x176x16.bmp
-#endif
 brickmania_bricks.220x176x16.bmp
 brickmania_pads.220x176x16.bmp
 brickmania_break.220x176x16.bmp
 brickmania_powerups.220x176x16.bmp
+#if LCD_HEIGHT == 320
+brickmania_menu_bg.240x320x16.bmp
+#elif LCD_HEIGHT == 176
+brickmania_menu_bg.220x176x16.bmp
 #endif
-brickmania_ball.220x176x16.bmp
-brickmania_menu_items.220x176x16.bmp
-brickmania_gameover.220x176x16.bmp
-#elif (((LCD_WIDTH == 160) && (LCD_HEIGHT == 128)) || \
-       ((LCD_WIDTH == 138) && (LCD_HEIGHT == 110))) && (LCD_DEPTH == 2)
-brickmania_menu_items.160x128x2.bmp
-brickmania_ball.160x128x2.bmp
-#if (LCD_WIDTH == 160)
-brickmania_bricks.160x128x2.bmp
-#else
-brickmania_bricks.138x110x2.bmp
 #endif
-brickmania_gameover.160x128x2.bmp
-brickmania_menu_bg.160x128x2.bmp
-brickmania_pads.160x128x2.bmp
-brickmania_powerups.160x128x2.bmp
-brickmania_break.160x128x2.bmp
-#elif (LCD_WIDTH == 160) && (LCD_HEIGHT == 128) && (LCD_DEPTH == 16)
-brickmania_menu_items.160x128x16.bmp
-brickmania_ball.160x128x16.bmp
-brickmania_bricks.160x128x16.bmp
-brickmania_gameover.160x128x16.bmp
-brickmania_menu_bg.160x128x16.bmp
-brickmania_pads.160x128x16.bmp
-brickmania_powerups.160x128x16.bmp
-brickmania_break.160x128x16.bmp
-#elif (LCD_WIDTH == 176)/* && (LCD_HEIGHT == 132) */&& (LCD_DEPTH == 16)
+#elif LCD_WIDTH >= 176
+brickmania_ball.5x5x16.bmp
 brickmania_menu_items.176x132x16.bmp
-brickmania_ball.176x132x16.bmp
 brickmania_bricks.176x132x16.bmp
-brickmania_gameover.176x132x16.bmp
 brickmania_menu_bg.176x132x16.bmp
 brickmania_pads.176x132x16.bmp
 brickmania_powerups.176x132x16.bmp
 brickmania_break.176x132x16.bmp
+#elif LCD_WIDTH >= 160
+brickmania_ball.5x5x16.bmp
+brickmania_menu_items.160x128x16.bmp
+brickmania_bricks.160x128x16.bmp
+brickmania_menu_bg.160x128x16.bmp
+brickmania_pads.160x128x16.bmp
+brickmania_powerups.160x128x16.bmp
+brickmania_break.160x128x16.bmp
+#elif LCD_WIDTH >= 132
+brickmania_ball.4x4x16.bmp
+brickmania_menu_items.132x80x16.bmp
+brickmania_bricks.132x80x16.bmp
+brickmania_menu_bg.132x80x16.bmp
+brickmania_pads.132x80x16.bmp
+brickmania_powerups.132x80x16.bmp
+brickmania_break.132x80x16.bmp
+#elif LCD_WIDTH >= 128
+brickmania_ball.4x4x16.bmp
+brickmania_menu_items.132x80x16.bmp
+brickmania_bricks.128x128x16.bmp
+brickmania_menu_bg.128x128x16.bmp
+brickmania_pads.132x80x16.bmp
+brickmania_powerups.132x80x16.bmp
+brickmania_break.132x80x16.bmp
+#endif /* different colour displays */
+#elif LCD_DEPTH > 1
+brickmania_gameover.86x43x2.bmp
+brickmania_menu_items.160x128x2.bmp
+brickmania_ball.5x5x2.bmp
+brickmania_menu_bg.160x128x2.bmp
+brickmania_pads.160x128x2.bmp
+brickmania_powerups.160x128x2.bmp
+brickmania_break.160x128x2.bmp
+#if (LCD_WIDTH >= 160)
+brickmania_bricks.160x128x2.bmp
+#else /* Mini currently */
+brickmania_bricks.138x110x2.bmp
+#endif
+#else /* mono */
+brickmania_gameover.59x30x1.bmp
+brickmania_menu_items.112x64x1.bmp
+brickmania_bricks.112x64x1.bmp
+brickmania_ball.3x3x1.bmp
+brickmania_pads.112x64x1.bmp
+brickmania_powerups.112x64x1.bmp
 #endif
 
 /* Jackpot */
diff --git a/apps/plugins/bitmaps/native/brickmania_ball.176x132x16.bmp b/apps/plugins/bitmaps/native/brickmania_ball.176x132x16.bmp
deleted file mode 100644
index 97da97f4a7..0000000000
--- a/apps/plugins/bitmaps/native/brickmania_ball.176x132x16.bmp
+++ /dev/null
diff --git a/apps/plugins/bitmaps/native/brickmania_ball.220x176x16.bmp b/apps/plugins/bitmaps/native/brickmania_ball.220x176x16.bmp
deleted file mode 100644
index 97da97f4a7..0000000000
--- a/apps/plugins/bitmaps/native/brickmania_ball.220x176x16.bmp
+++ /dev/null
diff --git a/apps/plugins/bitmaps/mono/brickmania_ball.112x64x1.bmp b/apps/plugins/bitmaps/native/brickmania_ball.3x3x1.bmp
index 221b13b774..221b13b774 100644
--- a/apps/plugins/bitmaps/mono/brickmania_ball.112x64x1.bmp
+++ b/apps/plugins/bitmaps/native/brickmania_ball.3x3x1.bmp
diff --git a/apps/plugins/bitmaps/native/brickmania_ball.4x4x16.bmp b/apps/plugins/bitmaps/native/brickmania_ball.4x4x16.bmp
new file mode 100644
index 0000000000..22b9bc8c37
--- /dev/null
+++ b/apps/plugins/bitmaps/native/brickmania_ball.4x4x16.bmp
diff --git a/apps/plugins/bitmaps/native/brickmania_ball.160x128x16.bmp b/apps/plugins/bitmaps/native/brickmania_ball.5x5x16.bmp
index 97da97f4a7..97da97f4a7 100644
--- a/apps/plugins/bitmaps/native/brickmania_ball.160x128x16.bmp
+++ b/apps/plugins/bitmaps/native/brickmania_ball.5x5x16.bmp
diff --git a/apps/plugins/bitmaps/native/brickmania_ball.160x128x2.bmp b/apps/plugins/bitmaps/native/brickmania_ball.5x5x2.bmp
index ddd4f212ce..ddd4f212ce 100644
--- a/apps/plugins/bitmaps/native/brickmania_ball.160x128x2.bmp
+++ b/apps/plugins/bitmaps/native/brickmania_ball.5x5x2.bmp
diff --git a/apps/plugins/bitmaps/native/brickmania_break.132x80x16.bmp b/apps/plugins/bitmaps/native/brickmania_break.132x80x16.bmp
new file mode 100644
index 0000000000..528fe13e2c
--- /dev/null
+++ b/apps/plugins/bitmaps/native/brickmania_break.132x80x16.bmp
diff --git a/apps/plugins/bitmaps/mono/brickmania_bricks.112x64x1.bmp b/apps/plugins/bitmaps/native/brickmania_bricks.112x64x1.bmp
index fba374d480..fba374d480 100644
--- a/apps/plugins/bitmaps/mono/brickmania_bricks.112x64x1.bmp
+++ b/apps/plugins/bitmaps/native/brickmania_bricks.112x64x1.bmp
diff --git a/apps/plugins/bitmaps/native/brickmania_bricks.128x128x16.bmp b/apps/plugins/bitmaps/native/brickmania_bricks.128x128x16.bmp
new file mode 100644
index 0000000000..8caf647a01
--- /dev/null
+++ b/apps/plugins/bitmaps/native/brickmania_bricks.128x128x16.bmp
diff --git a/apps/plugins/bitmaps/native/brickmania_bricks.132x80x16.bmp b/apps/plugins/bitmaps/native/brickmania_bricks.132x80x16.bmp
new file mode 100644
index 0000000000..757bb76450
--- /dev/null
+++ b/apps/plugins/bitmaps/native/brickmania_bricks.132x80x16.bmp
diff --git a/apps/plugins/bitmaps/native/brickmania_gameover.112x54x16.bmp b/apps/plugins/bitmaps/native/brickmania_gameover.112x54x16.bmp
new file mode 100644
index 0000000000..b25346d89a
--- /dev/null
+++ b/apps/plugins/bitmaps/native/brickmania_gameover.112x54x16.bmp
diff --git a/apps/plugins/bitmaps/native/brickmania_gameover.160x128x16.bmp b/apps/plugins/bitmaps/native/brickmania_gameover.160x128x16.bmp
deleted file mode 100644
index d004433b5f..0000000000
--- a/apps/plugins/bitmaps/native/brickmania_gameover.160x128x16.bmp
+++ /dev/null
diff --git a/apps/plugins/bitmaps/native/brickmania_gameover.160x128x2.bmp b/apps/plugins/bitmaps/native/brickmania_gameover.160x128x2.bmp
deleted file mode 100644
index 73afc2bfbb..0000000000
--- a/apps/plugins/bitmaps/native/brickmania_gameover.160x128x2.bmp
+++ /dev/null
diff --git a/apps/plugins/bitmaps/native/brickmania_gameover.176x132x16.bmp b/apps/plugins/bitmaps/native/brickmania_gameover.176x132x16.bmp
deleted file mode 100644
index d004433b5f..0000000000
--- a/apps/plugins/bitmaps/native/brickmania_gameover.176x132x16.bmp
+++ /dev/null
diff --git a/apps/plugins/bitmaps/native/brickmania_gameover.220x176x16.bmp b/apps/plugins/bitmaps/native/brickmania_gameover.220x176x16.bmp
deleted file mode 100644
index d004433b5f..0000000000
--- a/apps/plugins/bitmaps/native/brickmania_gameover.220x176x16.bmp
+++ /dev/null
diff --git a/apps/plugins/bitmaps/native/brickmania_gameover.59x30x1.bmp b/apps/plugins/bitmaps/native/brickmania_gameover.59x30x1.bmp
new file mode 100644
index 0000000000..d20822e731
--- /dev/null
+++ b/apps/plugins/bitmaps/native/brickmania_gameover.59x30x1.bmp
diff --git a/apps/plugins/bitmaps/native/brickmania_gameover.86x43x2.bmp b/apps/plugins/bitmaps/native/brickmania_gameover.86x43x2.bmp
new file mode 100644
index 0000000000..d45a48ad76
--- /dev/null
+++ b/apps/plugins/bitmaps/native/brickmania_gameover.86x43x2.bmp
diff --git a/apps/plugins/bitmaps/native/brickmania_menu_bg.128x128x16.bmp b/apps/plugins/bitmaps/native/brickmania_menu_bg.128x128x16.bmp
new file mode 100644
index 0000000000..30373baa2f
--- /dev/null
+++ b/apps/plugins/bitmaps/native/brickmania_menu_bg.128x128x16.bmp
diff --git a/apps/plugins/bitmaps/native/brickmania_menu_bg.132x80x16.bmp b/apps/plugins/bitmaps/native/brickmania_menu_bg.132x80x16.bmp
new file mode 100644
index 0000000000..e4ca574636
--- /dev/null
+++ b/apps/plugins/bitmaps/native/brickmania_menu_bg.132x80x16.bmp
diff --git a/apps/plugins/bitmaps/native/brickmania_menu_bg.160x128x16.bmp b/apps/plugins/bitmaps/native/brickmania_menu_bg.160x128x16.bmp
index 921365c22b..ee213efe6e 100644
--- a/apps/plugins/bitmaps/native/brickmania_menu_bg.160x128x16.bmp
+++ b/apps/plugins/bitmaps/native/brickmania_menu_bg.160x128x16.bmp
diff --git a/apps/plugins/bitmaps/native/brickmania_menu_bg.240x320x16.bmp b/apps/plugins/bitmaps/native/brickmania_menu_bg.240x320x16.bmp
index 93856e02a7..16c5549c7d 100644
--- a/apps/plugins/bitmaps/native/brickmania_menu_bg.240x320x16.bmp
+++ b/apps/plugins/bitmaps/native/brickmania_menu_bg.240x320x16.bmp
diff --git a/apps/plugins/bitmaps/native/brickmania_menu_bg.320x240x16.bmp b/apps/plugins/bitmaps/native/brickmania_menu_bg.320x240x16.bmp
index de6cc658b9..f2639cd65d 100644
--- a/apps/plugins/bitmaps/native/brickmania_menu_bg.320x240x16.bmp
+++ b/apps/plugins/bitmaps/native/brickmania_menu_bg.320x240x16.bmp
diff --git a/apps/plugins/bitmaps/native/brickmania_menu_items.112x64x1.bmp b/apps/plugins/bitmaps/native/brickmania_menu_items.112x64x1.bmp
new file mode 100644
index 0000000000..e341c67dfe
--- /dev/null
+++ b/apps/plugins/bitmaps/native/brickmania_menu_items.112x64x1.bmp
diff --git a/apps/plugins/bitmaps/native/brickmania_menu_items.132x80x16.bmp b/apps/plugins/bitmaps/native/brickmania_menu_items.132x80x16.bmp
new file mode 100644
index 0000000000..2594e86f45
--- /dev/null
+++ b/apps/plugins/bitmaps/native/brickmania_menu_items.132x80x16.bmp
diff --git a/apps/plugins/bitmaps/native/brickmania_menu_items.160x128x16.bmp b/apps/plugins/bitmaps/native/brickmania_menu_items.160x128x16.bmp
index 917a90badd..77dac8377f 100644
--- a/apps/plugins/bitmaps/native/brickmania_menu_items.160x128x16.bmp
+++ b/apps/plugins/bitmaps/native/brickmania_menu_items.160x128x16.bmp
diff --git a/apps/plugins/bitmaps/native/brickmania_menu_items.160x128x2.bmp b/apps/plugins/bitmaps/native/brickmania_menu_items.160x128x2.bmp
index 490e1a0bfa..5a8710a370 100644
--- a/apps/plugins/bitmaps/native/brickmania_menu_items.160x128x2.bmp
+++ b/apps/plugins/bitmaps/native/brickmania_menu_items.160x128x2.bmp
diff --git a/apps/plugins/bitmaps/native/brickmania_menu_items.176x132x16.bmp b/apps/plugins/bitmaps/native/brickmania_menu_items.176x132x16.bmp
index cba3e8c987..d7c6e554a2 100644
--- a/apps/plugins/bitmaps/native/brickmania_menu_items.176x132x16.bmp
+++ b/apps/plugins/bitmaps/native/brickmania_menu_items.176x132x16.bmp
diff --git a/apps/plugins/bitmaps/native/brickmania_menu_items.220x176x16.bmp b/apps/plugins/bitmaps/native/brickmania_menu_items.220x176x16.bmp
index e1ff9ec1e9..c82912a073 100644
--- a/apps/plugins/bitmaps/native/brickmania_menu_items.220x176x16.bmp
+++ b/apps/plugins/bitmaps/native/brickmania_menu_items.220x176x16.bmp
diff --git a/apps/plugins/bitmaps/mono/brickmania_pads.112x64x1.bmp b/apps/plugins/bitmaps/native/brickmania_pads.112x64x1.bmp
index 85e5ff1d72..85e5ff1d72 100644
--- a/apps/plugins/bitmaps/mono/brickmania_pads.112x64x1.bmp
+++ b/apps/plugins/bitmaps/native/brickmania_pads.112x64x1.bmp
diff --git a/apps/plugins/bitmaps/native/brickmania_pads.132x80x16.bmp b/apps/plugins/bitmaps/native/brickmania_pads.132x80x16.bmp
new file mode 100644
index 0000000000..03740cc3fb
--- /dev/null
+++ b/apps/plugins/bitmaps/native/brickmania_pads.132x80x16.bmp
diff --git a/apps/plugins/bitmaps/mono/brickmania_powerups.112x64x1.bmp b/apps/plugins/bitmaps/native/brickmania_powerups.112x64x1.bmp
index 66cca0a6d8..66cca0a6d8 100644
--- a/apps/plugins/bitmaps/mono/brickmania_powerups.112x64x1.bmp
+++ b/apps/plugins/bitmaps/native/brickmania_powerups.112x64x1.bmp
diff --git a/apps/plugins/bitmaps/native/brickmania_powerups.132x80x16.bmp b/apps/plugins/bitmaps/native/brickmania_powerups.132x80x16.bmp
new file mode 100644
index 0000000000..2ff913e3a3
--- /dev/null
+++ b/apps/plugins/bitmaps/native/brickmania_powerups.132x80x16.bmp