diff options
Diffstat (limited to 'apps/plugins')
-rw-r--r-- | apps/plugins/bitmaps/mono/SOURCES | 3 | ||||
-rw-r--r-- | apps/plugins/bitmaps/native/SOURCES | 14 | ||||
-rw-r--r-- | apps/plugins/bubbles.c | 2 | ||||
-rw-r--r-- | apps/plugins/wormlet.c | 3 |
4 files changed, 16 insertions, 6 deletions
diff --git a/apps/plugins/bitmaps/mono/SOURCES b/apps/plugins/bitmaps/mono/SOURCES index 813ede362c..c12c7c7d67 100644 --- a/apps/plugins/bitmaps/mono/SOURCES +++ b/apps/plugins/bitmaps/mono/SOURCES | |||
@@ -10,7 +10,8 @@ bubbles_bubble.132x80x16.bmp | |||
10 | #elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 96) | 10 | #elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 96) |
11 | bubbles_bubble.128x96x1.bmp | 11 | bubbles_bubble.128x96x1.bmp |
12 | #elif ((LCD_WIDTH == 160) && (LCD_HEIGHT == 128)) || \ | 12 | #elif ((LCD_WIDTH == 160) && (LCD_HEIGHT == 128)) || \ |
13 | ((LCD_WIDTH == 128) && (LCD_HEIGHT == 128)) | 13 | ((LCD_WIDTH == 128) && (LCD_HEIGHT == 128)) || \ |
14 | ((LCD_WIDTH == 128) && (LCD_HEIGHT == 160)) | ||
14 | bubbles_bubble.160x128x1.bmp | 15 | bubbles_bubble.160x128x1.bmp |
15 | #elif (LCD_WIDTH == 176) && (LCD_HEIGHT == 132) | 16 | #elif (LCD_WIDTH == 176) && (LCD_HEIGHT == 132) |
16 | bubbles_bubble.160x128x1.bmp | 17 | bubbles_bubble.160x128x1.bmp |
diff --git a/apps/plugins/bitmaps/native/SOURCES b/apps/plugins/bitmaps/native/SOURCES index 598f75975a..f655f59648 100644 --- a/apps/plugins/bitmaps/native/SOURCES +++ b/apps/plugins/bitmaps/native/SOURCES | |||
@@ -381,6 +381,8 @@ jewels.112x64x1.bmp | |||
381 | jewels.112x64x1.bmp | 381 | jewels.112x64x1.bmp |
382 | #elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 128) | 382 | #elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 128) |
383 | jewels.128x128x16.bmp | 383 | jewels.128x128x16.bmp |
384 | #elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 160) | ||
385 | jewels.128x128x16.bmp | ||
384 | #elif (LCD_WIDTH == 132) && (LCD_HEIGHT == 80) | 386 | #elif (LCD_WIDTH == 132) && (LCD_HEIGHT == 80) |
385 | jewels.132x80x16.bmp | 387 | jewels.132x80x16.bmp |
386 | #elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 96) | 388 | #elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 96) |
@@ -490,7 +492,7 @@ rockblox_background.176x220x16.bmp | |||
490 | rockblox_background.176x132x16.bmp | 492 | rockblox_background.176x132x16.bmp |
491 | #elif (LCD_WIDTH == 160) && (LCD_HEIGHT == 128) | 493 | #elif (LCD_WIDTH == 160) && (LCD_HEIGHT == 128) |
492 | rockblox_background.160x128x16.bmp | 494 | rockblox_background.160x128x16.bmp |
493 | #elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 128) | 495 | #elif (LCD_WIDTH == 128) && (LCD_HEIGHT >= 128) |
494 | rockblox_background.128x128x16.bmp | 496 | rockblox_background.128x128x16.bmp |
495 | #elif (LCD_WIDTH == 132) && (LCD_HEIGHT == 80) | 497 | #elif (LCD_WIDTH == 132) && (LCD_HEIGHT == 80) |
496 | rockblox_background.132x80x16.bmp | 498 | rockblox_background.132x80x16.bmp |
@@ -720,7 +722,7 @@ sudoku_inverse.138x110x2.bmp | |||
720 | sudoku_start.132x80x16.bmp | 722 | sudoku_start.132x80x16.bmp |
721 | sudoku_normal.132x80x16.bmp | 723 | sudoku_normal.132x80x16.bmp |
722 | sudoku_inverse.132x80x16.bmp | 724 | sudoku_inverse.132x80x16.bmp |
723 | #elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 128) && (LCD_DEPTH == 16) | 725 | #elif ((LCD_WIDTH == 128) && (LCD_HEIGHT == 128) && (LCD_DEPTH == 16)) || |
724 | sudoku_start.128x128x16.bmp | 726 | sudoku_start.128x128x16.bmp |
725 | sudoku_normal.128x128x16.bmp | 727 | sudoku_normal.128x128x16.bmp |
726 | sudoku_inverse.128x128x16.bmp | 728 | sudoku_inverse.128x128x16.bmp |
@@ -755,8 +757,12 @@ sudoku_start.640x480x16.bmp | |||
755 | sudoku_normal.640x480x16.bmp | 757 | sudoku_normal.640x480x16.bmp |
756 | sudoku_inverse.640x480x16.bmp | 758 | sudoku_inverse.640x480x16.bmp |
757 | #endif | 759 | #endif |
758 | #else | 760 | #else /* LCD_WIDTH < LCD_HEIGHT */ |
759 | #if ((LCD_WIDTH == 176) && (LCD_HEIGHT == 220) && (LCD_DEPTH == 16)) | 761 | #if ((LCD_WIDTH == 128) && (LCD_HEIGHT == 160) && (LCD_DEPTH == 16)) |
762 | sudoku_start.128x128x16.bmp | ||
763 | sudoku_normal.128x128x16.bmp | ||
764 | sudoku_inverse.128x128x16.bmp | ||
765 | #elif ((LCD_WIDTH == 176) && (LCD_HEIGHT == 220) && (LCD_DEPTH == 16)) | ||
760 | sudoku_start.220x176x16.bmp | 766 | sudoku_start.220x176x16.bmp |
761 | sudoku_normal.220x176x16.bmp | 767 | sudoku_normal.220x176x16.bmp |
762 | sudoku_inverse.220x176x16.bmp | 768 | sudoku_inverse.220x176x16.bmp |
diff --git a/apps/plugins/bubbles.c b/apps/plugins/bubbles.c index b35807de47..57e29ede04 100644 --- a/apps/plugins/bubbles.c +++ b/apps/plugins/bubbles.c | |||
@@ -205,7 +205,9 @@ enum { | |||
205 | #define ROW_HEIGHT (BUBBLE_WIDTH-(BUBBLE_WIDTH-EMBLEM_WIDTH)/2) | 205 | #define ROW_HEIGHT (BUBBLE_WIDTH-(BUBBLE_WIDTH-EMBLEM_WIDTH)/2) |
206 | #endif | 206 | #endif |
207 | 207 | ||
208 | #if !defined(ROW_INDENT) | ||
208 | #define ROW_INDENT (BUBBLE_WIDTH/2) | 209 | #define ROW_INDENT (BUBBLE_WIDTH/2) |
210 | #endif | ||
209 | 211 | ||
210 | #define TEXT_LINES (LCD_HEIGHT/8) | 212 | #define TEXT_LINES (LCD_HEIGHT/8) |
211 | 213 | ||
diff --git a/apps/plugins/wormlet.c b/apps/plugins/wormlet.c index 3d24f7fa19..e2076f75bd 100644 --- a/apps/plugins/wormlet.c +++ b/apps/plugins/wormlet.c | |||
@@ -358,7 +358,8 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
358 | #define ARGH_SIZE 5 | 358 | #define ARGH_SIZE 5 |
359 | #define SPEED 9 | 359 | #define SPEED 9 |
360 | #define MAX_WORM_SEGMENTS 128 | 360 | #define MAX_WORM_SEGMENTS 128 |
361 | #elif (LCD_WIDTH == 160) && (LCD_HEIGHT == 128) | 361 | #elif ((LCD_WIDTH == 160) && (LCD_HEIGHT == 128)) || \ |
362 | ((LCD_WIDTH == 128) && (LCD_HEIGHT == 160)) | ||
362 | #define FOOD_SIZE 4 | 363 | #define FOOD_SIZE 4 |
363 | #define ARGH_SIZE 5 | 364 | #define ARGH_SIZE 5 |
364 | #define SPEED 8 | 365 | #define SPEED 8 |