diff options
author | Jens Arnold <amiconn@rockbox.org> | 2008-05-25 21:12:18 +0000 |
---|---|---|
committer | Jens Arnold <amiconn@rockbox.org> | 2008-05-25 21:12:18 +0000 |
commit | 43d02f66a0ade99a8de3bd76a9d2533b11c7aa41 (patch) | |
tree | 21a4fd391a801365bf143ad6d3721e44c5224774 /apps | |
parent | 2aa0791ff80bf757534fcfb1e918515704ae4173 (diff) | |
download | rockbox-43d02f66a0ade99a8de3bd76a9d2533b11c7aa41.tar.gz rockbox-43d02f66a0ade99a8de3bd76a9d2533b11c7aa41.zip |
Fix rockblox on all 160x128x2 and 160x128x16 targets. They used the mono bitmap intended for m:robe100 as a native one, making the background looking odd and crashing the sim. Bitmaps for monochrome targets used like native bitmaps shouldn't reside in bitmaps/mono, as that's asking for confusion.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17629 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/plugins/bitmaps/mono/SOURCES | 9 | ||||
-rw-r--r-- | apps/plugins/bitmaps/native/SOURCES | 37 | ||||
-rw-r--r-- | apps/plugins/bitmaps/native/rockblox_background.112x64x1.bmp (renamed from apps/plugins/bitmaps/mono/rockblox_background.112x64x1.bmp) | bin | 1086 -> 1086 bytes | |||
-rw-r--r-- | apps/plugins/bitmaps/native/rockblox_background.128x64x1.bmp (renamed from apps/plugins/bitmaps/mono/rockblox_background.128x64x1.bmp) | bin | 1086 -> 1086 bytes | |||
-rw-r--r-- | apps/plugins/bitmaps/native/rockblox_background.160x128x1.bmp (renamed from apps/plugins/bitmaps/mono/rockblox_background.160x128x1.bmp) | bin | 2622 -> 2622 bytes |
5 files changed, 25 insertions, 21 deletions
diff --git a/apps/plugins/bitmaps/mono/SOURCES b/apps/plugins/bitmaps/mono/SOURCES index d2952d1ef7..e0e112d904 100644 --- a/apps/plugins/bitmaps/mono/SOURCES +++ b/apps/plugins/bitmaps/mono/SOURCES | |||
@@ -22,15 +22,6 @@ bubbles_bubble.220x176x1.bmp | |||
22 | bubbles_bubble.320x240x1.bmp | 22 | bubbles_bubble.320x240x1.bmp |
23 | #endif | 23 | #endif |
24 | 24 | ||
25 | /* Rockblox */ | ||
26 | #if (LCD_WIDTH == 112) && (LCD_HEIGHT == 64) | ||
27 | rockblox_background.112x64x1.bmp | ||
28 | #elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 64) | ||
29 | rockblox_background.128x64x1.bmp | ||
30 | #elif (LCD_WIDTH == 160) && (LCD_HEIGHT == 128) | ||
31 | rockblox_background.160x128x1.bmp | ||
32 | #endif | ||
33 | |||
34 | /* Flip it */ | 25 | /* Flip it */ |
35 | #ifndef HAVE_LCD_COLOR | 26 | #ifndef HAVE_LCD_COLOR |
36 | #if LCD_WIDTH >= 140 && LCD_HEIGHT >= 122 | 27 | #if LCD_WIDTH >= 140 && LCD_HEIGHT >= 122 |
diff --git a/apps/plugins/bitmaps/native/SOURCES b/apps/plugins/bitmaps/native/SOURCES index 4325da9a24..704f2ce2c4 100644 --- a/apps/plugins/bitmaps/native/SOURCES +++ b/apps/plugins/bitmaps/native/SOURCES | |||
@@ -369,29 +369,42 @@ pegbox_pieces.8x8x1.bmp | |||
369 | #endif | 369 | #endif |
370 | 370 | ||
371 | /* Rockblox */ | 371 | /* Rockblox */ |
372 | #if (LCD_WIDTH == 320) && (LCD_HEIGHT == 240) && (LCD_DEPTH == 16) | 372 | #if LCD_DEPTH == 16 /* colour versions*/ |
373 | #if (LCD_WIDTH == 320) && (LCD_HEIGHT == 240) | ||
373 | rockblox_background.320x240x16.bmp | 374 | rockblox_background.320x240x16.bmp |
374 | #elif (LCD_WIDTH == 240) && (LCD_HEIGHT == 320) && (LCD_DEPTH == 16) | 375 | #elif (LCD_WIDTH == 240) && (LCD_HEIGHT == 320) |
375 | rockblox_background.240x320x16.bmp | 376 | rockblox_background.240x320x16.bmp |
376 | #elif (LCD_WIDTH >= 220) && (LCD_HEIGHT >= 176) && (LCD_DEPTH == 16) | 377 | #elif (LCD_WIDTH == 220) && (LCD_HEIGHT == 176) |
377 | rockblox_background.220x176x16.bmp | 378 | rockblox_background.220x176x16.bmp |
378 | #elif (LCD_WIDTH == 176) && (LCD_HEIGHT == 132) && (LCD_DEPTH == 16) | 379 | #elif (LCD_WIDTH == 176) && (LCD_HEIGHT == 220) |
379 | rockblox_background.176x132x16.bmp | ||
380 | #elif (LCD_WIDTH == 176) && (LCD_HEIGHT == 220) && (LCD_DEPTH == 16) | ||
381 | rockblox_background.176x220x16.bmp | 380 | rockblox_background.176x220x16.bmp |
382 | #elif (LCD_WIDTH == 160) && (LCD_HEIGHT == 128) && (LCD_DEPTH >= 16) | 381 | #elif (LCD_WIDTH == 176) && (LCD_HEIGHT == 132) |
382 | rockblox_background.176x132x16.bmp | ||
383 | #elif (LCD_WIDTH == 160) && (LCD_HEIGHT == 128) | ||
383 | rockblox_background.160x128x16.bmp | 384 | rockblox_background.160x128x16.bmp |
384 | #elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 128) && (LCD_DEPTH == 16) | 385 | #elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 128) |
385 | rockblox_background.128x128x16.bmp | 386 | rockblox_background.128x128x16.bmp |
386 | #elif (LCD_WIDTH == 132) && (LCD_HEIGHT == 80) && (LCD_DEPTH == 16) | 387 | #elif (LCD_WIDTH == 132) && (LCD_HEIGHT == 80) |
387 | rockblox_background.132x80x16.bmp | 388 | rockblox_background.132x80x16.bmp |
388 | #elif (LCD_WIDTH == 160) && (LCD_HEIGHT == 128) && (LCD_DEPTH == 2) | 389 | #endif |
390 | #elif LCD_DEPTH == 2 /* greyscale versions */ | ||
391 | #if (LCD_WIDTH == 160) && (LCD_HEIGHT == 128) | ||
389 | rockblox_background.160x128x2.bmp | 392 | rockblox_background.160x128x2.bmp |
390 | #elif (LCD_WIDTH == 138) && (LCD_HEIGHT == 110) && (LCD_DEPTH == 2) | 393 | #elif (LCD_WIDTH == 138) && (LCD_HEIGHT == 110) |
391 | rockblox_background.138x110x2.bmp | 394 | rockblox_background.138x110x2.bmp |
392 | #elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 96) && (LCD_DEPTH == 2) | 395 | #elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 96) |
393 | rockblox_background.128x96x2.bmp | 396 | rockblox_background.128x96x2.bmp |
394 | #endif | 397 | #endif |
398 | #elif LCD_DEPTH == 1 /* monochrome versions */ | ||
399 | #if (LCD_WIDTH == 160) && (LCD_HEIGHT == 128) | ||
400 | rockblox_background.160x128x1.bmp | ||
401 | #elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 64) | ||
402 | rockblox_background.128x64x1.bmp | ||
403 | #elif (LCD_WIDTH == 112) && (LCD_HEIGHT == 64) | ||
404 | rockblox_background.112x64x1.bmp | ||
405 | #endif | ||
406 | #endif /* LCD_DEPTH */ | ||
407 | |||
395 | 408 | ||
396 | /* Rockpaint */ | 409 | /* Rockpaint */ |
397 | #ifdef HAVE_LCD_COLOR | 410 | #ifdef HAVE_LCD_COLOR |
diff --git a/apps/plugins/bitmaps/mono/rockblox_background.112x64x1.bmp b/apps/plugins/bitmaps/native/rockblox_background.112x64x1.bmp index 336e3cefef..336e3cefef 100644 --- a/apps/plugins/bitmaps/mono/rockblox_background.112x64x1.bmp +++ b/apps/plugins/bitmaps/native/rockblox_background.112x64x1.bmp | |||
Binary files differ | |||
diff --git a/apps/plugins/bitmaps/mono/rockblox_background.128x64x1.bmp b/apps/plugins/bitmaps/native/rockblox_background.128x64x1.bmp index 09b4c08d95..09b4c08d95 100644 --- a/apps/plugins/bitmaps/mono/rockblox_background.128x64x1.bmp +++ b/apps/plugins/bitmaps/native/rockblox_background.128x64x1.bmp | |||
Binary files differ | |||
diff --git a/apps/plugins/bitmaps/mono/rockblox_background.160x128x1.bmp b/apps/plugins/bitmaps/native/rockblox_background.160x128x1.bmp index 77d606ae21..77d606ae21 100644 --- a/apps/plugins/bitmaps/mono/rockblox_background.160x128x1.bmp +++ b/apps/plugins/bitmaps/native/rockblox_background.160x128x1.bmp | |||
Binary files differ | |||