diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/plugins/SOURCES | 2 | ||||
-rw-r--r-- | apps/plugins/bitmaps/mono/SOURCES | 2 | ||||
-rwxr-xr-x | apps/plugins/bitmaps/mono/rockblox_background.128x64x1.bmp | bin | 0 -> 1086 bytes | |||
-rw-r--r-- | apps/plugins/bitmaps/native/SOURCES | 2 | ||||
-rwxr-xr-x | apps/plugins/bitmaps/native/rockblox_background.176x220x16.bmp | bin | 0 -> 116214 bytes | |||
-rw-r--r-- | apps/plugins/rockblox.c | 39 |
6 files changed, 42 insertions, 3 deletions
diff --git a/apps/plugins/SOURCES b/apps/plugins/SOURCES index 0c3b5778bd..f3967298a4 100644 --- a/apps/plugins/SOURCES +++ b/apps/plugins/SOURCES | |||
@@ -9,9 +9,7 @@ logo.c | |||
9 | mosaique.c | 9 | mosaique.c |
10 | properties.c | 10 | properties.c |
11 | random_folder_advance_config.c | 11 | random_folder_advance_config.c |
12 | #if ((LCD_WIDTH != 128) || (LCD_HEIGHT != 64)) && !defined(SANSA_E200) | ||
13 | rockblox.c | 12 | rockblox.c |
14 | #endif | ||
15 | rockbox_flash.c | 13 | rockbox_flash.c |
16 | search.c | 14 | search.c |
17 | snow.c | 15 | snow.c |
diff --git a/apps/plugins/bitmaps/mono/SOURCES b/apps/plugins/bitmaps/mono/SOURCES index c165abecde..c5c26cdc0b 100644 --- a/apps/plugins/bitmaps/mono/SOURCES +++ b/apps/plugins/bitmaps/mono/SOURCES | |||
@@ -49,6 +49,8 @@ brickmania_powerups.112x64x1.bmp | |||
49 | /* Rockblox */ | 49 | /* Rockblox */ |
50 | #if (LCD_WIDTH == 112) && (LCD_HEIGHT == 64) | 50 | #if (LCD_WIDTH == 112) && (LCD_HEIGHT == 64) |
51 | rockblox_background.112x64x1.bmp | 51 | rockblox_background.112x64x1.bmp |
52 | #elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 64) | ||
53 | rockblox_background.128x64x1.bmp | ||
52 | #endif | 54 | #endif |
53 | 55 | ||
54 | /* Flip it */ | 56 | /* Flip it */ |
diff --git a/apps/plugins/bitmaps/mono/rockblox_background.128x64x1.bmp b/apps/plugins/bitmaps/mono/rockblox_background.128x64x1.bmp new file mode 100755 index 0000000000..09b4c08d95 --- /dev/null +++ b/apps/plugins/bitmaps/mono/rockblox_background.128x64x1.bmp | |||
Binary files differ | |||
diff --git a/apps/plugins/bitmaps/native/SOURCES b/apps/plugins/bitmaps/native/SOURCES index 0521f72d4a..53a8b22b21 100644 --- a/apps/plugins/bitmaps/native/SOURCES +++ b/apps/plugins/bitmaps/native/SOURCES | |||
@@ -318,6 +318,8 @@ rockblox_background.240x320x16.bmp | |||
318 | rockblox_background.220x176x16.bmp | 318 | rockblox_background.220x176x16.bmp |
319 | #elif (LCD_WIDTH == 176) && (LCD_HEIGHT == 132) && (LCD_DEPTH == 16) | 319 | #elif (LCD_WIDTH == 176) && (LCD_HEIGHT == 132) && (LCD_DEPTH == 16) |
320 | rockblox_background.176x132x16.bmp | 320 | rockblox_background.176x132x16.bmp |
321 | #elif (LCD_WIDTH == 176) && (LCD_HEIGHT == 220) && (LCD_DEPTH == 16) | ||
322 | rockblox_background.176x220x16.bmp | ||
321 | #elif (LCD_WIDTH == 160) && (LCD_HEIGHT == 128) && (LCD_DEPTH >= 16) | 323 | #elif (LCD_WIDTH == 160) && (LCD_HEIGHT == 128) && (LCD_DEPTH >= 16) |
322 | rockblox_background.160x128x16.bmp | 324 | rockblox_background.160x128x16.bmp |
323 | #elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 128) && (LCD_DEPTH == 16) | 325 | #elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 128) && (LCD_DEPTH == 16) |
diff --git a/apps/plugins/bitmaps/native/rockblox_background.176x220x16.bmp b/apps/plugins/bitmaps/native/rockblox_background.176x220x16.bmp new file mode 100755 index 0000000000..5046615c0f --- /dev/null +++ b/apps/plugins/bitmaps/native/rockblox_background.176x220x16.bmp | |||
Binary files differ | |||
diff --git a/apps/plugins/rockblox.c b/apps/plugins/rockblox.c index ebb6fe016d..ef6fcafcd8 100644 --- a/apps/plugins/rockblox.c +++ b/apps/plugins/rockblox.c | |||
@@ -123,12 +123,24 @@ PLUGIN_HEADER | |||
123 | #define ROCKBLOX_OFF BUTTON_A | 123 | #define ROCKBLOX_OFF BUTTON_A |
124 | #define ROCKBLOX_ROTATE_RIGHT BUTTON_VOL_DOWN | 124 | #define ROCKBLOX_ROTATE_RIGHT BUTTON_VOL_DOWN |
125 | #define ROCKBLOX_ROTATE_LEFT BUTTON_VOL_UP | 125 | #define ROCKBLOX_ROTATE_LEFT BUTTON_VOL_UP |
126 | #define ROCKBLOX_ROTATE BUTTON_UP | 126 | #define ROCKBLOX_ROTATE BUTTON_UP |
127 | #define ROCKBLOX_DOWN BUTTON_DOWN | 127 | #define ROCKBLOX_DOWN BUTTON_DOWN |
128 | #define ROCKBLOX_LEFT BUTTON_LEFT | 128 | #define ROCKBLOX_LEFT BUTTON_LEFT |
129 | #define ROCKBLOX_RIGHT BUTTON_RIGHT | 129 | #define ROCKBLOX_RIGHT BUTTON_RIGHT |
130 | #define ROCKBLOX_DROP BUTTON_SELECT | 130 | #define ROCKBLOX_DROP BUTTON_SELECT |
131 | #define ROCKBLOX_RESTART BUTTON_MENU | 131 | #define ROCKBLOX_RESTART BUTTON_MENU |
132 | |||
133 | #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD | ||
134 | |||
135 | #define ROCKBLOX_OFF BUTTON_PLAY | ||
136 | #define ROCKBLOX_ROTATE_RIGHT BUTTON_UP | ||
137 | #define ROCKBLOX_ROTATE_LEFT BUTTON_SELECT | ||
138 | #define ROCKBLOX_DOWN BUTTON_DOWN | ||
139 | #define ROCKBLOX_LEFT BUTTON_LEFT | ||
140 | #define ROCKBLOX_RIGHT BUTTON_RIGHT | ||
141 | #define ROCKBLOX_DROP BUTTON_MODE | ||
142 | #define ROCKBLOX_RESTART BUTTON_EQ | ||
143 | |||
132 | #endif | 144 | #endif |
133 | 145 | ||
134 | #define BLOCKS_NUM 7 | 146 | #define BLOCKS_NUM 7 |
@@ -195,6 +207,18 @@ PLUGIN_HEADER | |||
195 | #define LEVEL_Y 49 | 207 | #define LEVEL_Y 49 |
196 | #define LINES_Y 81 | 208 | #define LINES_Y 81 |
197 | 209 | ||
210 | #elif (LCD_WIDTH == 176) && (LCD_HEIGHT == 220) | ||
211 | |||
212 | #define BLOCK_WIDTH 10 | ||
213 | #define BLOCK_HEIGHT 10 | ||
214 | #define BOARD_X 6 | ||
215 | #define BOARD_Y 10 | ||
216 | #define PREVIEW_X 124 | ||
217 | #define PREVIEW_Y 167 | ||
218 | #define LABEL_X 117 | ||
219 | #define SCORE_Y 24 | ||
220 | #define LEVEL_Y 65 | ||
221 | #define LINES_Y 103 | ||
198 | #elif (LCD_WIDTH == 160) && (LCD_HEIGHT == 128) | 222 | #elif (LCD_WIDTH == 160) && (LCD_HEIGHT == 128) |
199 | 223 | ||
200 | #define BLOCK_WIDTH 6 | 224 | #define BLOCK_WIDTH 6 |
@@ -221,6 +245,19 @@ PLUGIN_HEADER | |||
221 | #define LEVEL_Y 49 | 245 | #define LEVEL_Y 49 |
222 | #define LINES_Y 82 | 246 | #define LINES_Y 82 |
223 | 247 | ||
248 | #elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 64) | ||
249 | |||
250 | #define BLOCK_WIDTH 3 | ||
251 | #define BLOCK_HEIGHT 3 | ||
252 | #define BOARD_X 9 | ||
253 | #define BOARD_Y 3 | ||
254 | #define PREVIEW_X 53 | ||
255 | #define PREVIEW_Y 5 | ||
256 | #define LABEL_X 70 | ||
257 | #define SCORE_Y 32 | ||
258 | #define LEVEL_Y 13 | ||
259 | #define LINES_Y 51 | ||
260 | |||
224 | #elif (LCD_WIDTH == 112) && (LCD_HEIGHT == 64) | 261 | #elif (LCD_WIDTH == 112) && (LCD_HEIGHT == 64) |
225 | 262 | ||
226 | #define BLOCK_WIDTH 4 | 263 | #define BLOCK_WIDTH 4 |