summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorBen Basha <benbasha@rockbox.org>2006-06-05 20:41:52 +0000
committerBen Basha <benbasha@rockbox.org>2006-06-05 20:41:52 +0000
commitd510a6edf7aa343ef4697710632447bcfca62dfa (patch)
treeac80024c49c9bf1f75424175e94c391e8fae6530 /apps
parent7366fb4e60dcb37d3366e1dc9a607df081853c2e (diff)
downloadrockbox-d510a6edf7aa343ef4697710632447bcfca62dfa.tar.gz
rockbox-d510a6edf7aa343ef4697710632447bcfca62dfa.tar.bz2
rockbox-d510a6edf7aa343ef4697710632447bcfca62dfa.zip
*decrease brickmania bitmaps files in the bitmaps folders. *fix break effect bitmaps of the nano and the x5.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10067 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/plugins/bitmaps/mono/SOURCES11
-rwxr-xr-xapps/plugins/bitmaps/mono/brickmania_help.112x64x1.bmpbin98 -> 0 bytes
-rwxr-xr-xapps/plugins/bitmaps/mono/brickmania_menu_items.112x64x1.bmpbin0 -> 19496 bytes
-rwxr-xr-xapps/plugins/bitmaps/mono/brickmania_no_resume.112x64x1.bmpbin370 -> 0 bytes
-rwxr-xr-xapps/plugins/bitmaps/mono/brickmania_quit.112x64x1.bmpbin98 -> 0 bytes
-rwxr-xr-xapps/plugins/bitmaps/mono/brickmania_resume.112x64x1.bmpbin370 -> 0 bytes
-rwxr-xr-xapps/plugins/bitmaps/mono/brickmania_sel_help.112x64x1.bmpbin98 -> 0 bytes
-rwxr-xr-xapps/plugins/bitmaps/mono/brickmania_sel_quit.112x64x1.bmpbin98 -> 0 bytes
-rwxr-xr-xapps/plugins/bitmaps/mono/brickmania_sel_resume.112x64x1.bmpbin370 -> 0 bytes
-rwxr-xr-xapps/plugins/bitmaps/mono/brickmania_sel_start.112x64x1.bmpbin170 -> 0 bytes
-rwxr-xr-xapps/plugins/bitmaps/mono/brickmania_start.112x64x1.bmpbin170 -> 0 bytes
-rw-r--r--apps/plugins/bitmaps/native/SOURCES40
-rwxr-xr-xapps/plugins/bitmaps/native/brickmania_break.160x128x16.bmpbin2616 -> 1736 bytes
-rwxr-xr-xapps/plugins/bitmaps/native/brickmania_break.176x132x16.bmpbin1720 -> 1876 bytes
-rwxr-xr-xapps/plugins/bitmaps/native/brickmania_help.160x128x16.bmpbin1436 -> 0 bytes
-rw-r--r--apps/plugins/bitmaps/native/brickmania_help.160x128x2.bmpbin316 -> 0 bytes
-rwxr-xr-xapps/plugins/bitmaps/native/brickmania_help.176x132x16.bmpbin1232 -> 0 bytes
-rw-r--r--apps/plugins/bitmaps/native/brickmania_help.220x176x16.bmpbin2182 -> 0 bytes
-rwxr-xr-xapps/plugins/bitmaps/native/brickmania_menu_bg.160x128x16.bmpbin61496 -> 61496 bytes
-rwxr-xr-xapps/plugins/bitmaps/native/brickmania_menu_bg.176x132x16.bmpbin69752 -> 69752 bytes
-rw-r--r--apps/plugins/bitmaps/native/brickmania_menu_bg.220x176x16.bmpbin116216 -> 116216 bytes
-rwxr-xr-xapps/plugins/bitmaps/native/brickmania_menu_items.160x128x16.bmpbin0 -> 40448 bytes
-rwxr-xr-xapps/plugins/bitmaps/native/brickmania_menu_items.160x128x2.bmpbin0 -> 40448 bytes
-rwxr-xr-xapps/plugins/bitmaps/native/brickmania_menu_items.176x132x16.bmpbin0 -> 38648 bytes
-rwxr-xr-xapps/plugins/bitmaps/native/brickmania_menu_items.220x176x16.bmpbin0 -> 60536 bytes
-rwxr-xr-xapps/plugins/bitmaps/native/brickmania_no_resume.160x128x16.bmpbin3360 -> 0 bytes
-rw-r--r--apps/plugins/bitmaps/native/brickmania_no_resume.160x128x2.bmpbin720 -> 0 bytes
-rwxr-xr-xapps/plugins/bitmaps/native/brickmania_no_resume.176x132x16.bmpbin3020 -> 0 bytes
-rw-r--r--apps/plugins/bitmaps/native/brickmania_no_resume.220x176x16.bmpbin4950 -> 0 bytes
-rwxr-xr-xapps/plugins/bitmaps/native/brickmania_quit.160x128x16.bmpbin1620 -> 0 bytes
-rw-r--r--apps/plugins/bitmaps/native/brickmania_quit.160x128x2.bmpbin348 -> 0 bytes
-rwxr-xr-xapps/plugins/bitmaps/native/brickmania_quit.176x132x16.bmpbin1120 -> 0 bytes
-rw-r--r--apps/plugins/bitmaps/native/brickmania_quit.220x176x16.bmpbin1954 -> 0 bytes
-rwxr-xr-xapps/plugins/bitmaps/native/brickmania_resume.160x128x16.bmpbin3360 -> 0 bytes
-rw-r--r--apps/plugins/bitmaps/native/brickmania_resume.160x128x2.bmpbin636 -> 0 bytes
-rwxr-xr-xapps/plugins/bitmaps/native/brickmania_resume.176x132x16.bmpbin3020 -> 0 bytes
-rw-r--r--apps/plugins/bitmaps/native/brickmania_resume.220x176x16.bmpbin4950 -> 0 bytes
-rwxr-xr-xapps/plugins/bitmaps/native/brickmania_sel_help.160x128x16.bmpbin1436 -> 0 bytes
-rw-r--r--apps/plugins/bitmaps/native/brickmania_sel_help.160x128x2.bmpbin316 -> 0 bytes
-rwxr-xr-xapps/plugins/bitmaps/native/brickmania_sel_help.176x132x16.bmpbin1232 -> 0 bytes
-rw-r--r--apps/plugins/bitmaps/native/brickmania_sel_help.220x176x16.bmpbin2182 -> 0 bytes
-rwxr-xr-xapps/plugins/bitmaps/native/brickmania_sel_quit.160x128x16.bmpbin1620 -> 0 bytes
-rw-r--r--apps/plugins/bitmaps/native/brickmania_sel_quit.160x128x2.bmpbin348 -> 0 bytes
-rwxr-xr-xapps/plugins/bitmaps/native/brickmania_sel_quit.176x132x16.bmpbin1120 -> 0 bytes
-rw-r--r--apps/plugins/bitmaps/native/brickmania_sel_quit.220x176x16.bmpbin1954 -> 0 bytes
-rwxr-xr-xapps/plugins/bitmaps/native/brickmania_sel_resume.160x128x16.bmpbin3360 -> 0 bytes
-rw-r--r--apps/plugins/bitmaps/native/brickmania_sel_resume.160x128x2.bmpbin636 -> 0 bytes
-rwxr-xr-xapps/plugins/bitmaps/native/brickmania_sel_resume.176x132x16.bmpbin3020 -> 0 bytes
-rw-r--r--apps/plugins/bitmaps/native/brickmania_sel_resume.220x176x16.bmpbin4950 -> 0 bytes
-rwxr-xr-xapps/plugins/bitmaps/native/brickmania_sel_start.160x128x16.bmpbin4280 -> 0 bytes
-rw-r--r--apps/plugins/bitmaps/native/brickmania_sel_start.160x128x2.bmpbin780 -> 0 bytes
-rwxr-xr-xapps/plugins/bitmaps/native/brickmania_sel_start.176x132x16.bmpbin4344 -> 0 bytes
-rw-r--r--apps/plugins/bitmaps/native/brickmania_sel_start.220x176x16.bmpbin6774 -> 0 bytes
-rwxr-xr-xapps/plugins/bitmaps/native/brickmania_start.160x128x16.bmpbin4280 -> 0 bytes
-rw-r--r--apps/plugins/bitmaps/native/brickmania_start.160x128x2.bmpbin780 -> 0 bytes
-rwxr-xr-xapps/plugins/bitmaps/native/brickmania_start.176x132x16.bmpbin4344 -> 0 bytes
-rw-r--r--apps/plugins/bitmaps/native/brickmania_start.220x176x16.bmpbin6774 -> 0 bytes
-rw-r--r--apps/plugins/brickmania.c204
58 files changed, 120 insertions, 135 deletions
diff --git a/apps/plugins/bitmaps/mono/SOURCES b/apps/plugins/bitmaps/mono/SOURCES
index 0a463c714e..82bab1be12 100644
--- a/apps/plugins/bitmaps/mono/SOURCES
+++ b/apps/plugins/bitmaps/mono/SOURCES
@@ -18,20 +18,11 @@ bubbles_bubble.320x240x1.bmp
/* BrickMania */
#if (LCD_WIDTH == 112) && (LCD_HEIGHT == 64)
-
+brickmania_menu_items.112x64x1.bmp
brickmania_bricks.112x64x1.bmp
brickmania_ball.112x64x1.bmp
-brickmania_help.112x64x1.bmp
-brickmania_no_resume.112x64x1.bmp
brickmania_pads.112x64x1.bmp
brickmania_powerups.112x64x1.bmp
-brickmania_quit.112x64x1.bmp
-brickmania_resume.112x64x1.bmp
-brickmania_sel_help.112x64x1.bmp
-brickmania_sel_resume.112x64x1.bmp
-brickmania_sel_quit.112x64x1.bmp
-brickmania_sel_start.112x64x1.bmp
-brickmania_start.112x64x1.bmp
#endif
diff --git a/apps/plugins/bitmaps/mono/brickmania_help.112x64x1.bmp b/apps/plugins/bitmaps/mono/brickmania_help.112x64x1.bmp
deleted file mode 100755
index 0d69adeeba..0000000000
--- a/apps/plugins/bitmaps/mono/brickmania_help.112x64x1.bmp
+++ /dev/null
Binary files differ
diff --git a/apps/plugins/bitmaps/mono/brickmania_menu_items.112x64x1.bmp b/apps/plugins/bitmaps/mono/brickmania_menu_items.112x64x1.bmp
new file mode 100755
index 0000000000..0403c9ae95
--- /dev/null
+++ b/apps/plugins/bitmaps/mono/brickmania_menu_items.112x64x1.bmp
Binary files differ
diff --git a/apps/plugins/bitmaps/mono/brickmania_no_resume.112x64x1.bmp b/apps/plugins/bitmaps/mono/brickmania_no_resume.112x64x1.bmp
deleted file mode 100755
index 1c8391346c..0000000000
--- a/apps/plugins/bitmaps/mono/brickmania_no_resume.112x64x1.bmp
+++ /dev/null
Binary files differ
diff --git a/apps/plugins/bitmaps/mono/brickmania_quit.112x64x1.bmp b/apps/plugins/bitmaps/mono/brickmania_quit.112x64x1.bmp
deleted file mode 100755
index 3b66731189..0000000000
--- a/apps/plugins/bitmaps/mono/brickmania_quit.112x64x1.bmp
+++ /dev/null
Binary files differ
diff --git a/apps/plugins/bitmaps/mono/brickmania_resume.112x64x1.bmp b/apps/plugins/bitmaps/mono/brickmania_resume.112x64x1.bmp
deleted file mode 100755
index 1e1dd0899f..0000000000
--- a/apps/plugins/bitmaps/mono/brickmania_resume.112x64x1.bmp
+++ /dev/null
Binary files differ
diff --git a/apps/plugins/bitmaps/mono/brickmania_sel_help.112x64x1.bmp b/apps/plugins/bitmaps/mono/brickmania_sel_help.112x64x1.bmp
deleted file mode 100755
index c4bf13c247..0000000000
--- a/apps/plugins/bitmaps/mono/brickmania_sel_help.112x64x1.bmp
+++ /dev/null
Binary files differ
diff --git a/apps/plugins/bitmaps/mono/brickmania_sel_quit.112x64x1.bmp b/apps/plugins/bitmaps/mono/brickmania_sel_quit.112x64x1.bmp
deleted file mode 100755
index 356d4535cf..0000000000
--- a/apps/plugins/bitmaps/mono/brickmania_sel_quit.112x64x1.bmp
+++ /dev/null
Binary files differ
diff --git a/apps/plugins/bitmaps/mono/brickmania_sel_resume.112x64x1.bmp b/apps/plugins/bitmaps/mono/brickmania_sel_resume.112x64x1.bmp
deleted file mode 100755
index 19836b5817..0000000000
--- a/apps/plugins/bitmaps/mono/brickmania_sel_resume.112x64x1.bmp
+++ /dev/null
Binary files differ
diff --git a/apps/plugins/bitmaps/mono/brickmania_sel_start.112x64x1.bmp b/apps/plugins/bitmaps/mono/brickmania_sel_start.112x64x1.bmp
deleted file mode 100755
index ac17d39e69..0000000000
--- a/apps/plugins/bitmaps/mono/brickmania_sel_start.112x64x1.bmp
+++ /dev/null
Binary files differ
diff --git a/apps/plugins/bitmaps/mono/brickmania_start.112x64x1.bmp b/apps/plugins/bitmaps/mono/brickmania_start.112x64x1.bmp
deleted file mode 100755
index a805ba0b9c..0000000000
--- a/apps/plugins/bitmaps/mono/brickmania_start.112x64x1.bmp
+++ /dev/null
Binary files differ
diff --git a/apps/plugins/bitmaps/native/SOURCES b/apps/plugins/bitmaps/native/SOURCES
index a8d24ee196..ee5c103aaa 100644
--- a/apps/plugins/bitmaps/native/SOURCES
+++ b/apps/plugins/bitmaps/native/SOURCES
@@ -139,24 +139,17 @@ brickmania_menu_bg.320x240x16.bmp
#else
brickmania_menu_bg.220x176x16.bmp
#endif
+brickmania_menu_items.220x176x16.bmp
brickmania_ball.220x176x16.bmp
brickmania_bricks.220x176x16.bmp
brickmania_gameover.220x176x16.bmp
-brickmania_help.220x176x16.bmp
-brickmania_no_resume.220x176x16.bmp
brickmania_pads.220x176x16.bmp
brickmania_powerups.220x176x16.bmp
-brickmania_quit.220x176x16.bmp
-brickmania_resume.220x176x16.bmp
-brickmania_sel_help.220x176x16.bmp
-brickmania_sel_resume.220x176x16.bmp
-brickmania_sel_quit.220x176x16.bmp
-brickmania_sel_start.220x176x16.bmp
-brickmania_start.220x176x16.bmp
brickmania_break.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
@@ -164,54 +157,29 @@ brickmania_bricks.160x128x2.bmp
brickmania_bricks.138x110x2.bmp
#endif
brickmania_gameover.160x128x2.bmp
-brickmania_help.160x128x2.bmp
brickmania_menu_bg.160x128x2.bmp
-brickmania_no_resume.160x128x2.bmp
brickmania_pads.160x128x2.bmp
brickmania_powerups.160x128x2.bmp
-brickmania_quit.160x128x2.bmp
-brickmania_resume.160x128x2.bmp
-brickmania_sel_help.160x128x2.bmp
-brickmania_sel_resume.160x128x2.bmp
-brickmania_sel_quit.160x128x2.bmp
-brickmania_sel_start.160x128x2.bmp
-brickmania_start.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_help.160x128x16.bmp
brickmania_menu_bg.160x128x16.bmp
-brickmania_no_resume.160x128x16.bmp
brickmania_pads.160x128x16.bmp
brickmania_powerups.160x128x16.bmp
-brickmania_quit.160x128x16.bmp
-brickmania_resume.160x128x16.bmp
-brickmania_sel_help.160x128x16.bmp
-brickmania_sel_resume.160x128x16.bmp
-brickmania_sel_quit.160x128x16.bmp
-brickmania_sel_start.160x128x16.bmp
-brickmania_start.160x128x16.bmp
brickmania_break.160x128x16.bmp
#elif (LCD_WIDTH == 176) && (LCD_HEIGHT == 132) && (LCD_DEPTH == 16)
+brickmania_menu_items.176x132x16.bmp
brickmania_ball.176x132x16.bmp
brickmania_bricks.176x132x16.bmp
brickmania_gameover.176x132x16.bmp
-brickmania_help.176x132x16.bmp
brickmania_menu_bg.176x132x16.bmp
-brickmania_no_resume.176x132x16.bmp
brickmania_pads.176x132x16.bmp
brickmania_powerups.176x132x16.bmp
-brickmania_quit.176x132x16.bmp
-brickmania_resume.176x132x16.bmp
-brickmania_sel_help.176x132x16.bmp
-brickmania_sel_resume.176x132x16.bmp
-brickmania_sel_quit.176x132x16.bmp
-brickmania_sel_start.176x132x16.bmp
-brickmania_start.176x132x16.bmp
brickmania_break.176x132x16.bmp
#endif
diff --git a/apps/plugins/bitmaps/native/brickmania_break.160x128x16.bmp b/apps/plugins/bitmaps/native/brickmania_break.160x128x16.bmp
index b8e912fbbd..d8d418db37 100755
--- a/apps/plugins/bitmaps/native/brickmania_break.160x128x16.bmp
+++ b/apps/plugins/bitmaps/native/brickmania_break.160x128x16.bmp
Binary files differ
diff --git a/apps/plugins/bitmaps/native/brickmania_break.176x132x16.bmp b/apps/plugins/bitmaps/native/brickmania_break.176x132x16.bmp
index 179d76d77c..26a8b80596 100755
--- a/apps/plugins/bitmaps/native/brickmania_break.176x132x16.bmp
+++ b/apps/plugins/bitmaps/native/brickmania_break.176x132x16.bmp
Binary files differ
diff --git a/apps/plugins/bitmaps/native/brickmania_help.160x128x16.bmp b/apps/plugins/bitmaps/native/brickmania_help.160x128x16.bmp
deleted file mode 100755
index 71d7651e04..0000000000
--- a/apps/plugins/bitmaps/native/brickmania_help.160x128x16.bmp
+++ /dev/null
Binary files differ
diff --git a/apps/plugins/bitmaps/native/brickmania_help.160x128x2.bmp b/apps/plugins/bitmaps/native/brickmania_help.160x128x2.bmp
deleted file mode 100644
index 5295dfc107..0000000000
--- a/apps/plugins/bitmaps/native/brickmania_help.160x128x2.bmp
+++ /dev/null
Binary files differ
diff --git a/apps/plugins/bitmaps/native/brickmania_help.176x132x16.bmp b/apps/plugins/bitmaps/native/brickmania_help.176x132x16.bmp
deleted file mode 100755
index 2eb711f16c..0000000000
--- a/apps/plugins/bitmaps/native/brickmania_help.176x132x16.bmp
+++ /dev/null
Binary files differ
diff --git a/apps/plugins/bitmaps/native/brickmania_help.220x176x16.bmp b/apps/plugins/bitmaps/native/brickmania_help.220x176x16.bmp
deleted file mode 100644
index 4798886090..0000000000
--- a/apps/plugins/bitmaps/native/brickmania_help.220x176x16.bmp
+++ /dev/null
Binary files differ
diff --git a/apps/plugins/bitmaps/native/brickmania_menu_bg.160x128x16.bmp b/apps/plugins/bitmaps/native/brickmania_menu_bg.160x128x16.bmp
index b881f6e025..921365c22b 100755
--- a/apps/plugins/bitmaps/native/brickmania_menu_bg.160x128x16.bmp
+++ b/apps/plugins/bitmaps/native/brickmania_menu_bg.160x128x16.bmp
Binary files differ
diff --git a/apps/plugins/bitmaps/native/brickmania_menu_bg.176x132x16.bmp b/apps/plugins/bitmaps/native/brickmania_menu_bg.176x132x16.bmp
index 3f54bcf63b..14aa8db052 100755
--- a/apps/plugins/bitmaps/native/brickmania_menu_bg.176x132x16.bmp
+++ b/apps/plugins/bitmaps/native/brickmania_menu_bg.176x132x16.bmp
Binary files differ
diff --git a/apps/plugins/bitmaps/native/brickmania_menu_bg.220x176x16.bmp b/apps/plugins/bitmaps/native/brickmania_menu_bg.220x176x16.bmp
index f5765b84ca..afee59713a 100644
--- a/apps/plugins/bitmaps/native/brickmania_menu_bg.220x176x16.bmp
+++ b/apps/plugins/bitmaps/native/brickmania_menu_bg.220x176x16.bmp
Binary files differ
diff --git a/apps/plugins/bitmaps/native/brickmania_menu_items.160x128x16.bmp b/apps/plugins/bitmaps/native/brickmania_menu_items.160x128x16.bmp
new file mode 100755
index 0000000000..917a90badd
--- /dev/null
+++ b/apps/plugins/bitmaps/native/brickmania_menu_items.160x128x16.bmp
Binary files differ
diff --git a/apps/plugins/bitmaps/native/brickmania_menu_items.160x128x2.bmp b/apps/plugins/bitmaps/native/brickmania_menu_items.160x128x2.bmp
new file mode 100755
index 0000000000..490e1a0bfa
--- /dev/null
+++ b/apps/plugins/bitmaps/native/brickmania_menu_items.160x128x2.bmp
Binary files differ
diff --git a/apps/plugins/bitmaps/native/brickmania_menu_items.176x132x16.bmp b/apps/plugins/bitmaps/native/brickmania_menu_items.176x132x16.bmp
new file mode 100755
index 0000000000..cba3e8c987
--- /dev/null
+++ b/apps/plugins/bitmaps/native/brickmania_menu_items.176x132x16.bmp
Binary files differ
diff --git a/apps/plugins/bitmaps/native/brickmania_menu_items.220x176x16.bmp b/apps/plugins/bitmaps/native/brickmania_menu_items.220x176x16.bmp
new file mode 100755
index 0000000000..e1ff9ec1e9
--- /dev/null
+++ b/apps/plugins/bitmaps/native/brickmania_menu_items.220x176x16.bmp
Binary files differ
diff --git a/apps/plugins/bitmaps/native/brickmania_no_resume.160x128x16.bmp b/apps/plugins/bitmaps/native/brickmania_no_resume.160x128x16.bmp
deleted file mode 100755
index ca0ff85db6..0000000000
--- a/apps/plugins/bitmaps/native/brickmania_no_resume.160x128x16.bmp
+++ /dev/null
Binary files differ
diff --git a/apps/plugins/bitmaps/native/brickmania_no_resume.160x128x2.bmp b/apps/plugins/bitmaps/native/brickmania_no_resume.160x128x2.bmp
deleted file mode 100644
index b23118bea4..0000000000
--- a/apps/plugins/bitmaps/native/brickmania_no_resume.160x128x2.bmp
+++ /dev/null
Binary files differ
diff --git a/apps/plugins/bitmaps/native/brickmania_no_resume.176x132x16.bmp b/apps/plugins/bitmaps/native/brickmania_no_resume.176x132x16.bmp
deleted file mode 100755
index 7807b0480c..0000000000
--- a/apps/plugins/bitmaps/native/brickmania_no_resume.176x132x16.bmp
+++ /dev/null
Binary files differ
diff --git a/apps/plugins/bitmaps/native/brickmania_no_resume.220x176x16.bmp b/apps/plugins/bitmaps/native/brickmania_no_resume.220x176x16.bmp
deleted file mode 100644
index 81b3cf83b8..0000000000
--- a/apps/plugins/bitmaps/native/brickmania_no_resume.220x176x16.bmp
+++ /dev/null
Binary files differ
diff --git a/apps/plugins/bitmaps/native/brickmania_quit.160x128x16.bmp b/apps/plugins/bitmaps/native/brickmania_quit.160x128x16.bmp
deleted file mode 100755
index 92e1dba58c..0000000000
--- a/apps/plugins/bitmaps/native/brickmania_quit.160x128x16.bmp
+++ /dev/null
Binary files differ
diff --git a/apps/plugins/bitmaps/native/brickmania_quit.160x128x2.bmp b/apps/plugins/bitmaps/native/brickmania_quit.160x128x2.bmp
deleted file mode 100644
index b52635df29..0000000000
--- a/apps/plugins/bitmaps/native/brickmania_quit.160x128x2.bmp
+++ /dev/null
Binary files differ
diff --git a/apps/plugins/bitmaps/native/brickmania_quit.176x132x16.bmp b/apps/plugins/bitmaps/native/brickmania_quit.176x132x16.bmp
deleted file mode 100755
index f75e1a6ce0..0000000000
--- a/apps/plugins/bitmaps/native/brickmania_quit.176x132x16.bmp
+++ /dev/null
Binary files differ
diff --git a/apps/plugins/bitmaps/native/brickmania_quit.220x176x16.bmp b/apps/plugins/bitmaps/native/brickmania_quit.220x176x16.bmp
deleted file mode 100644
index 262650544f..0000000000
--- a/apps/plugins/bitmaps/native/brickmania_quit.220x176x16.bmp
+++ /dev/null
Binary files differ
diff --git a/apps/plugins/bitmaps/native/brickmania_resume.160x128x16.bmp b/apps/plugins/bitmaps/native/brickmania_resume.160x128x16.bmp
deleted file mode 100755
index aca549c783..0000000000
--- a/apps/plugins/bitmaps/native/brickmania_resume.160x128x16.bmp
+++ /dev/null
Binary files differ
diff --git a/apps/plugins/bitmaps/native/brickmania_resume.160x128x2.bmp b/apps/plugins/bitmaps/native/brickmania_resume.160x128x2.bmp
deleted file mode 100644
index fed63c07a9..0000000000
--- a/apps/plugins/bitmaps/native/brickmania_resume.160x128x2.bmp
+++ /dev/null
Binary files differ
diff --git a/apps/plugins/bitmaps/native/brickmania_resume.176x132x16.bmp b/apps/plugins/bitmaps/native/brickmania_resume.176x132x16.bmp
deleted file mode 100755
index fbb9115f6b..0000000000
--- a/apps/plugins/bitmaps/native/brickmania_resume.176x132x16.bmp
+++ /dev/null
Binary files differ
diff --git a/apps/plugins/bitmaps/native/brickmania_resume.220x176x16.bmp b/apps/plugins/bitmaps/native/brickmania_resume.220x176x16.bmp
deleted file mode 100644
index fd8753f57d..0000000000
--- a/apps/plugins/bitmaps/native/brickmania_resume.220x176x16.bmp
+++ /dev/null
Binary files differ
diff --git a/apps/plugins/bitmaps/native/brickmania_sel_help.160x128x16.bmp b/apps/plugins/bitmaps/native/brickmania_sel_help.160x128x16.bmp
deleted file mode 100755
index 4b45e615b8..0000000000
--- a/apps/plugins/bitmaps/native/brickmania_sel_help.160x128x16.bmp
+++ /dev/null
Binary files differ
diff --git a/apps/plugins/bitmaps/native/brickmania_sel_help.160x128x2.bmp b/apps/plugins/bitmaps/native/brickmania_sel_help.160x128x2.bmp
deleted file mode 100644
index 0e89806844..0000000000
--- a/apps/plugins/bitmaps/native/brickmania_sel_help.160x128x2.bmp
+++ /dev/null
Binary files differ
diff --git a/apps/plugins/bitmaps/native/brickmania_sel_help.176x132x16.bmp b/apps/plugins/bitmaps/native/brickmania_sel_help.176x132x16.bmp
deleted file mode 100755
index ba9750a68c..0000000000
--- a/apps/plugins/bitmaps/native/brickmania_sel_help.176x132x16.bmp
+++ /dev/null
Binary files differ
diff --git a/apps/plugins/bitmaps/native/brickmania_sel_help.220x176x16.bmp b/apps/plugins/bitmaps/native/brickmania_sel_help.220x176x16.bmp
deleted file mode 100644
index c738b1f68c..0000000000
--- a/apps/plugins/bitmaps/native/brickmania_sel_help.220x176x16.bmp
+++ /dev/null
Binary files differ
diff --git a/apps/plugins/bitmaps/native/brickmania_sel_quit.160x128x16.bmp b/apps/plugins/bitmaps/native/brickmania_sel_quit.160x128x16.bmp
deleted file mode 100755
index 57d599887f..0000000000
--- a/apps/plugins/bitmaps/native/brickmania_sel_quit.160x128x16.bmp
+++ /dev/null
Binary files differ
diff --git a/apps/plugins/bitmaps/native/brickmania_sel_quit.160x128x2.bmp b/apps/plugins/bitmaps/native/brickmania_sel_quit.160x128x2.bmp
deleted file mode 100644
index 1d6f5b794d..0000000000
--- a/apps/plugins/bitmaps/native/brickmania_sel_quit.160x128x2.bmp
+++ /dev/null
Binary files differ
diff --git a/apps/plugins/bitmaps/native/brickmania_sel_quit.176x132x16.bmp b/apps/plugins/bitmaps/native/brickmania_sel_quit.176x132x16.bmp
deleted file mode 100755
index e605a41835..0000000000
--- a/apps/plugins/bitmaps/native/brickmania_sel_quit.176x132x16.bmp
+++ /dev/null
Binary files differ
diff --git a/apps/plugins/bitmaps/native/brickmania_sel_quit.220x176x16.bmp b/apps/plugins/bitmaps/native/brickmania_sel_quit.220x176x16.bmp
deleted file mode 100644
index 58ee4a3f77..0000000000
--- a/apps/plugins/bitmaps/native/brickmania_sel_quit.220x176x16.bmp
+++ /dev/null
Binary files differ
diff --git a/apps/plugins/bitmaps/native/brickmania_sel_resume.160x128x16.bmp b/apps/plugins/bitmaps/native/brickmania_sel_resume.160x128x16.bmp
deleted file mode 100755
index 3b7653c9dc..0000000000
--- a/apps/plugins/bitmaps/native/brickmania_sel_resume.160x128x16.bmp
+++ /dev/null
Binary files differ
diff --git a/apps/plugins/bitmaps/native/brickmania_sel_resume.160x128x2.bmp b/apps/plugins/bitmaps/native/brickmania_sel_resume.160x128x2.bmp
deleted file mode 100644
index 6a2a89d71b..0000000000
--- a/apps/plugins/bitmaps/native/brickmania_sel_resume.160x128x2.bmp
+++ /dev/null
Binary files differ
diff --git a/apps/plugins/bitmaps/native/brickmania_sel_resume.176x132x16.bmp b/apps/plugins/bitmaps/native/brickmania_sel_resume.176x132x16.bmp
deleted file mode 100755
index e5981c0143..0000000000
--- a/apps/plugins/bitmaps/native/brickmania_sel_resume.176x132x16.bmp
+++ /dev/null
Binary files differ
diff --git a/apps/plugins/bitmaps/native/brickmania_sel_resume.220x176x16.bmp b/apps/plugins/bitmaps/native/brickmania_sel_resume.220x176x16.bmp
deleted file mode 100644
index 9b2c144714..0000000000
--- a/apps/plugins/bitmaps/native/brickmania_sel_resume.220x176x16.bmp
+++ /dev/null
Binary files differ
diff --git a/apps/plugins/bitmaps/native/brickmania_sel_start.160x128x16.bmp b/apps/plugins/bitmaps/native/brickmania_sel_start.160x128x16.bmp
deleted file mode 100755
index 6c8c96b892..0000000000
--- a/apps/plugins/bitmaps/native/brickmania_sel_start.160x128x16.bmp
+++ /dev/null
Binary files differ
diff --git a/apps/plugins/bitmaps/native/brickmania_sel_start.160x128x2.bmp b/apps/plugins/bitmaps/native/brickmania_sel_start.160x128x2.bmp
deleted file mode 100644
index 1ae5e5fd99..0000000000
--- a/apps/plugins/bitmaps/native/brickmania_sel_start.160x128x2.bmp
+++ /dev/null
Binary files differ
diff --git a/apps/plugins/bitmaps/native/brickmania_sel_start.176x132x16.bmp b/apps/plugins/bitmaps/native/brickmania_sel_start.176x132x16.bmp
deleted file mode 100755
index 4d4c1d6e17..0000000000
--- a/apps/plugins/bitmaps/native/brickmania_sel_start.176x132x16.bmp
+++ /dev/null
Binary files differ
diff --git a/apps/plugins/bitmaps/native/brickmania_sel_start.220x176x16.bmp b/apps/plugins/bitmaps/native/brickmania_sel_start.220x176x16.bmp
deleted file mode 100644
index d9265863b0..0000000000
--- a/apps/plugins/bitmaps/native/brickmania_sel_start.220x176x16.bmp
+++ /dev/null
Binary files differ
diff --git a/apps/plugins/bitmaps/native/brickmania_start.160x128x16.bmp b/apps/plugins/bitmaps/native/brickmania_start.160x128x16.bmp
deleted file mode 100755
index 65ddbd7461..0000000000
--- a/apps/plugins/bitmaps/native/brickmania_start.160x128x16.bmp
+++ /dev/null
Binary files differ
diff --git a/apps/plugins/bitmaps/native/brickmania_start.160x128x2.bmp b/apps/plugins/bitmaps/native/brickmania_start.160x128x2.bmp
deleted file mode 100644
index dcfc70a950..0000000000
--- a/apps/plugins/bitmaps/native/brickmania_start.160x128x2.bmp
+++ /dev/null
Binary files differ
diff --git a/apps/plugins/bitmaps/native/brickmania_start.176x132x16.bmp b/apps/plugins/bitmaps/native/brickmania_start.176x132x16.bmp
deleted file mode 100755
index a7768eda86..0000000000
--- a/apps/plugins/bitmaps/native/brickmania_start.176x132x16.bmp
+++ /dev/null
Binary files differ
diff --git a/apps/plugins/bitmaps/native/brickmania_start.220x176x16.bmp b/apps/plugins/bitmaps/native/brickmania_start.220x176x16.bmp
deleted file mode 100644
index 8d5bfb2ec9..0000000000
--- a/apps/plugins/bitmaps/native/brickmania_start.220x176x16.bmp
+++ /dev/null
Binary files differ
diff --git a/apps/plugins/brickmania.c b/apps/plugins/brickmania.c
index 7c9a2433c7..b5d0e47445 100644
--- a/apps/plugins/brickmania.c
+++ b/apps/plugins/brickmania.c
@@ -106,21 +106,25 @@ PLUGIN_HEADER
static struct plugin_api* rb;
+enum menu_items {
+ BM_START,
+ BM_SEL_START,
+ BM_RESUME,
+ BM_SEL_RESUME,
+ BM_NO_RESUME,
+ BM_HELP,
+ BM_SEL_HELP,
+ BM_QUIT,
+ BM_SEL_QUIT,
+};
+
/* External bitmaps */
#if (LCD_WIDTH != 112) && (LCD_HEIGHT != 64)
extern const fb_data brickmania_menu_bg[];
extern const fb_data brickmania_gameover[];
#endif
+extern const fb_data brickmania_menu_items[];
extern const fb_data brickmania_ball[];
-extern const fb_data brickmania_help[];
-extern const fb_data brickmania_no_resume[];
-extern const fb_data brickmania_quit[];
-extern const fb_data brickmania_resume[];
-extern const fb_data brickmania_sel_help[];
-extern const fb_data brickmania_sel_quit[];
-extern const fb_data brickmania_sel_resume[];
-extern const fb_data brickmania_sel_start[];
-extern const fb_data brickmania_start[];
#ifdef HAVE_LCD_COLOR
extern const fb_data brickmania_break[];
#endif
@@ -159,17 +163,8 @@ extern const fb_data brickmania_bricks[];
#define LEFTMARGIN 5
#define TOPMARGIN 30
-#define BMPHEIGHT_start 20
-#define BMPWIDTH_start 112
-
-#define BMPHEIGHT_resume 17
-#define BMPWIDTH_resume 96
-
-#define BMPHEIGHT_help 19
-#define BMPWIDTH_help 37
-
-#define BMPHEIGHT_quit 19
-#define BMPWIDTH_quit 33
+#define MENU_BMPHEIGHT 20
+#define MENU_BMPWIDTH 112
#define BMPHEIGHT_powerup 6
#define BMPWIDTH_powerup 10
@@ -210,17 +205,8 @@ extern const fb_data brickmania_bricks[];
#define LEFTMARGIN 5
#define TOPMARGIN 21
-#define BMPHEIGHT_start 16
-#define BMPWIDTH_start 88
-
-#define BMPHEIGHT_resume 14
-#define BMPWIDTH_resume 78
-
-#define BMPHEIGHT_help 15
-#define BMPWIDTH_help 30
-
-#define BMPHEIGHT_quit 17
-#define BMPWIDTH_quit 30
+#define MENU_BMPHEIGHT 17
+#define MENU_BMPWIDTH 88
#define BMPHEIGHT_powerup 6
#define BMPWIDTH_powerup 10
@@ -277,17 +263,8 @@ extern const fb_data brickmania_bricks[];
#define LEFTMARGIN 4
#define TOPMARGIN 10
-#define BMPHEIGHT_start 16
-#define BMPWIDTH_start 88
-
-#define BMPHEIGHT_resume 14
-#define BMPWIDTH_resume 78
-
-#define BMPHEIGHT_help 15
-#define BMPWIDTH_help 30
-
-#define BMPHEIGHT_quit 17
-#define BMPWIDTH_quit 30
+#define MENU_BMPHEIGHT 17
+#define MENU_BMPWIDTH 88
#define BMPHEIGHT_powerup 6
#define BMPWIDTH_powerup 10
@@ -329,18 +306,8 @@ extern const fb_data brickmania_bricks[];
#define LEFTMARGIN 1
#define TOPMARGIN 10
-#define BMPHEIGHT_start 9
-#define BMPWIDTH_start 80
-
-#define BMPHEIGHT_resume 7
-#define BMPWIDTH_resume 71
-
-#define BMPHEIGHT_help 9
-#define BMPWIDTH_help 26
-
-#define BMPHEIGHT_quit 9
-#define BMPWIDTH_quit 25
-
+#define MENU_BMPHEIGHT 9
+#define MENU_BMPWIDTH 80
#define BMPHEIGHT_powerup 6
#define BMPWIDTH_powerup 7
@@ -378,17 +345,8 @@ extern const fb_data brickmania_bricks[];
#define LEFTMARGIN 3
#define TOPMARGIN 21
-#define BMPHEIGHT_start 16
-#define BMPWIDTH_start 89
-
-#define BMPHEIGHT_resume 13
-#define BMPWIDTH_resume 76
-
-#define BMPHEIGHT_help 14
-#define BMPWIDTH_help 28
-
-#define BMPHEIGHT_quit 14
-#define BMPWIDTH_quit 25
+#define MENU_BMPHEIGHT 16
+#define MENU_BMPWIDTH 89
#define BMPHEIGHT_powerup 6
#define BMPWIDTH_powerup 10
@@ -842,7 +800,6 @@ void sleep (int secs)
}
-
#define HIGH_SCORE "brickmania.score"
#define MENU_LENGTH 4
int game_menu(int when)
@@ -851,48 +808,117 @@ int game_menu(int when)
char str[10];
rb->lcd_clear_display();
#if (LCD_WIDTH != 112) && (LCD_HEIGHT != 64)
- rb->lcd_bitmap(brickmania_menu_bg,0,0,BMPWIDTH_menu,BMPHEIGHT_menu);
+ rb->lcd_bitmap(brickmania_menu_bg, 0, 0, BMPWIDTH_menu, BMPHEIGHT_menu);
#endif
while (true) {
for(i=0;i<MENU_LENGTH;i++) {
+#ifdef HAVE_LCD_COLOR
if (cur==0)
- rb->lcd_bitmap(brickmania_sel_start,
- BMPXOFS_start,BMPYOFS_start,
- BMPWIDTH_start,BMPHEIGHT_start);
+ rb->lcd_bitmap_transparent_part(brickmania_menu_items, 0,
+ MENU_BMPHEIGHT * BM_SEL_START, MENU_BMPWIDTH,
+ BMPXOFS_start, BMPYOFS_start, MENU_BMPWIDTH,
+ MENU_BMPHEIGHT);
else
- rb->lcd_bitmap(brickmania_start,BMPXOFS_start,BMPYOFS_start,
- BMPWIDTH_start,BMPHEIGHT_start);
+ rb->lcd_bitmap_transparent_part(brickmania_menu_items, 0,
+ MENU_BMPHEIGHT * BM_START, MENU_BMPWIDTH,
+ BMPXOFS_start, BMPYOFS_start, MENU_BMPWIDTH,
+ MENU_BMPHEIGHT);
if (when==1) {
if (cur==1)
- rb->lcd_bitmap(brickmania_sel_resume,
- BMPXOFS_resume,BMPYOFS_resume,
- BMPWIDTH_resume,BMPHEIGHT_resume);
+ rb->lcd_bitmap_transparent_part(brickmania_menu_items, 0,
+ MENU_BMPHEIGHT * BM_SEL_RESUME, MENU_BMPWIDTH,
+ BMPXOFS_resume, BMPYOFS_resume, MENU_BMPWIDTH,
+ MENU_BMPHEIGHT);
else
- rb->lcd_bitmap(brickmania_resume,
- BMPXOFS_resume,BMPYOFS_resume,
- BMPWIDTH_resume,BMPHEIGHT_resume);
+ rb->lcd_bitmap_transparent_part(brickmania_menu_items, 0,
+ MENU_BMPHEIGHT * BM_RESUME, MENU_BMPWIDTH,
+ BMPXOFS_resume, BMPYOFS_resume, MENU_BMPWIDTH,
+ MENU_BMPHEIGHT);
} else {
- rb->lcd_bitmap(brickmania_no_resume,
- BMPXOFS_resume,BMPYOFS_resume,
- BMPWIDTH_resume,BMPHEIGHT_resume);
+ rb->lcd_bitmap_transparent_part(brickmania_menu_items, 0,
+ MENU_BMPHEIGHT * BM_NO_RESUME, MENU_BMPWIDTH,
+ BMPXOFS_resume, BMPYOFS_resume, MENU_BMPWIDTH,
+ MENU_BMPHEIGHT);
}
if (cur==2)
- rb->lcd_bitmap(brickmania_sel_help,BMPXOFS_help,BMPYOFS_help,
- BMPWIDTH_help,BMPHEIGHT_help);
+ rb->lcd_bitmap_transparent_part(brickmania_menu_items, 0,
+ MENU_BMPHEIGHT * BM_SEL_HELP, MENU_BMPWIDTH,
+ BMPXOFS_help, BMPYOFS_help, MENU_BMPWIDTH,
+ MENU_BMPHEIGHT);
else
- rb->lcd_bitmap(brickmania_help,BMPXOFS_help,BMPYOFS_help,
- BMPWIDTH_help,BMPHEIGHT_help);
+ rb->lcd_bitmap_transparent_part(brickmania_menu_items, 0,
+ MENU_BMPHEIGHT * BM_HELP, MENU_BMPWIDTH,
+ BMPXOFS_help, BMPYOFS_help, MENU_BMPWIDTH,
+ MENU_BMPHEIGHT);
if (cur==3)
- rb->lcd_bitmap(brickmania_sel_quit,BMPXOFS_quit,BMPYOFS_quit,
- BMPWIDTH_quit,BMPHEIGHT_quit);
+ rb->lcd_bitmap_transparent_part(brickmania_menu_items, 0,
+ MENU_BMPHEIGHT * BM_SEL_QUIT, MENU_BMPWIDTH,
+ BMPXOFS_quit, BMPYOFS_quit, MENU_BMPWIDTH,
+ MENU_BMPHEIGHT);
else
- rb->lcd_bitmap(brickmania_quit,BMPXOFS_quit,BMPYOFS_quit,
- BMPWIDTH_quit,BMPHEIGHT_quit);
+ rb->lcd_bitmap_transparent_part(brickmania_menu_items, 0,
+ MENU_BMPHEIGHT * BM_QUIT, MENU_BMPWIDTH,
+ BMPXOFS_quit, BMPYOFS_quit, MENU_BMPWIDTH,
+ MENU_BMPHEIGHT);
+#else
+ if (cur==0)
+ rb->lcd_bitmap_part(brickmania_menu_items, 0,
+ MENU_BMPHEIGHT * BM_SEL_START, MENU_BMPWIDTH,
+ BMPXOFS_start, BMPYOFS_start, MENU_BMPWIDTH,
+ MENU_BMPHEIGHT);
+ else
+ rb->lcd_bitmap_part(brickmania_menu_items, 0,
+ MENU_BMPHEIGHT * BM_START, MENU_BMPWIDTH,
+ BMPXOFS_start, BMPYOFS_start, MENU_BMPWIDTH,
+ MENU_BMPHEIGHT);
+
+ if (when==1) {
+ if (cur==1)
+ rb->lcd_bitmap_part(brickmania_menu_items, 0,
+ MENU_BMPHEIGHT * BM_SEL_RESUME, MENU_BMPWIDTH,
+ BMPXOFS_resume, BMPYOFS_resume, MENU_BMPWIDTH,
+ MENU_BMPHEIGHT);
+ else
+ rb->lcd_bitmap_part(brickmania_menu_items, 0,
+ MENU_BMPHEIGHT * BM_RESUME, MENU_BMPWIDTH,
+ BMPXOFS_resume, BMPYOFS_resume, MENU_BMPWIDTH,
+ MENU_BMPHEIGHT);
+
+ } else {
+ rb->lcd_bitmap_part(brickmania_menu_items, 0,
+ MENU_BMPHEIGHT * BM_NO_RESUME, MENU_BMPWIDTH,
+ BMPXOFS_resume, BMPYOFS_resume, MENU_BMPWIDTH,
+ MENU_BMPHEIGHT);
+ }
+
+
+ if (cur==2)
+ rb->lcd_bitmap_part(brickmania_menu_items, 0,
+ MENU_BMPHEIGHT * BM_SEL_HELP, MENU_BMPWIDTH,
+ BMPXOFS_help, BMPYOFS_help, MENU_BMPWIDTH,
+ MENU_BMPHEIGHT);
+ else
+ rb->lcd_bitmap_part(brickmania_menu_items, 0,
+ MENU_BMPHEIGHT * BM_HELP, MENU_BMPWIDTH,
+ BMPXOFS_help, BMPYOFS_help, MENU_BMPWIDTH,
+ MENU_BMPHEIGHT);
+
+ if (cur==3)
+ rb->lcd_bitmap_part(brickmania_menu_items, 0,
+ MENU_BMPHEIGHT * BM_SEL_QUIT, MENU_BMPWIDTH,
+ BMPXOFS_quit, BMPYOFS_quit, MENU_BMPWIDTH,
+ MENU_BMPHEIGHT);
+ else
+ rb->lcd_bitmap_part(brickmania_menu_items, 0,
+ MENU_BMPHEIGHT * BM_QUIT, MENU_BMPWIDTH,
+ BMPXOFS_quit, BMPYOFS_quit, MENU_BMPWIDTH,
+ MENU_BMPHEIGHT);
+#endif
}
rb->lcd_set_drawmode(DRMODE_FG);
/* high score */