diff options
-rw-r--r-- | apps/plugins/bitmaps/native/superdom_boarditems.480x640x16.bmp | bin | 0 -> 11718 bytes | |||
-rw-r--r-- | apps/plugins/bitmaps/native/superdom_boarditems.640x480x16.bmp | bin | 0 -> 14454 bytes | |||
-rw-r--r-- | apps/plugins/superdom.c | 50 |
3 files changed, 17 insertions, 33 deletions
diff --git a/apps/plugins/bitmaps/native/superdom_boarditems.480x640x16.bmp b/apps/plugins/bitmaps/native/superdom_boarditems.480x640x16.bmp new file mode 100644 index 0000000000..bc5175cbbd --- /dev/null +++ b/apps/plugins/bitmaps/native/superdom_boarditems.480x640x16.bmp | |||
Binary files differ | |||
diff --git a/apps/plugins/bitmaps/native/superdom_boarditems.640x480x16.bmp b/apps/plugins/bitmaps/native/superdom_boarditems.640x480x16.bmp new file mode 100644 index 0000000000..1b4471c48a --- /dev/null +++ b/apps/plugins/bitmaps/native/superdom_boarditems.640x480x16.bmp | |||
Binary files differ | |||
diff --git a/apps/plugins/superdom.c b/apps/plugins/superdom.c index 1a44bad518..3e1e23785a 100644 --- a/apps/plugins/superdom.c +++ b/apps/plugins/superdom.c | |||
@@ -21,6 +21,7 @@ | |||
21 | #include "plugin.h" | 21 | #include "plugin.h" |
22 | #include "lib/playback_control.h" | 22 | #include "lib/playback_control.h" |
23 | #include "lib/display_text.h" | 23 | #include "lib/display_text.h" |
24 | #include "pluginbitmaps/superdom_boarditems.h" | ||
24 | PLUGIN_HEADER | 25 | PLUGIN_HEADER |
25 | 26 | ||
26 | extern const fb_data superdom_boarditems[]; | 27 | extern const fb_data superdom_boarditems[]; |
@@ -47,40 +48,23 @@ char buf[255]; | |||
47 | 48 | ||
48 | #endif | 49 | #endif |
49 | 50 | ||
50 | #if LCD_WIDTH == 220 && LCD_HEIGHT == 176 | 51 | /* NUM_BOX HEIGHT and WIDTH are used for the number pad in the game. The height |
51 | #define NUM_BOX_HEIGHT 25 | 52 | * calculation includes spacing for the text placed above and below the number |
52 | #define NUM_BOX_WIDTH 30 | 53 | * pad (it divides by 6 instead of just 4). The width calculation gives extra |
53 | #define STRIDE 14 | 54 | * spacing on the sides of the pad too (divides by 5 instead of 3). |
54 | #define ICON_HEIGHT 7 | 55 | */ |
55 | #define ICON_WIDTH 7 | 56 | #define NUM_BOX_HEIGHT (LCD_HEIGHT/6) |
56 | 57 | #define NUM_BOX_WIDTH (LCD_WIDTH/5) | |
57 | #elif (LCD_WIDTH == 160 && LCD_HEIGHT == 128) || \ | ||
58 | (LCD_WIDTH == 176 && LCD_HEIGHT == 132) || \ | ||
59 | (LCD_WIDTH == 176 && LCD_HEIGHT == 220) | ||
60 | #define NUM_BOX_HEIGHT 20 | ||
61 | #define NUM_BOX_WIDTH 24 | ||
62 | #define STRIDE 8 | ||
63 | #define ICON_HEIGHT 4 | ||
64 | #define ICON_WIDTH 4 | ||
65 | |||
66 | #elif (LCD_WIDTH == 320 && LCD_HEIGHT == 240) | ||
67 | #define NUM_BOX_HEIGHT 25 | ||
68 | #define NUM_BOX_WIDTH 30 | ||
69 | #define STRIDE 20 | ||
70 | #define ICON_HEIGHT 10 | ||
71 | #define ICON_WIDTH 10 | ||
72 | |||
73 | #elif (LCD_WIDTH == 240 && (LCD_HEIGHT == 320 || LCD_HEIGHT == 400)) | ||
74 | #define NUM_BOX_HEIGHT 25 | ||
75 | #define NUM_BOX_WIDTH 30 | ||
76 | #define STRIDE 18 | ||
77 | #define ICON_HEIGHT 9 | ||
78 | #define ICON_WIDTH 9 | ||
79 | 58 | ||
80 | #endif | 59 | #define NUM_MARGIN_X (LCD_WIDTH-3*NUM_BOX_WIDTH)/2 |
60 | #define NUM_MARGIN_Y (LCD_HEIGHT-4*NUM_BOX_HEIGHT)/2 | ||
81 | 61 | ||
82 | #define NUM_MARGIN_X (LCD_WIDTH-3*NUM_BOX_WIDTH)/2 | 62 | /* These parameters define the piece image dimensions, Stride is the total width |
83 | #define NUM_MARGIN_Y (LCD_HEIGHT-4*NUM_BOX_HEIGHT)/2 | 63 | * of the bitmap. |
64 | */ | ||
65 | #define STRIDE BMPWIDTH_superdom_boarditems | ||
66 | #define ICON_HEIGHT (BMPHEIGHT_superdom_boarditems/6) | ||
67 | #define ICON_WIDTH (BMPWIDTH_superdom_boarditems/2) | ||
84 | 68 | ||
85 | #if (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \ | 69 | #if (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
86 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | 70 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) |
@@ -155,7 +139,7 @@ char buf[255]; | |||
155 | #define SUPERDOM_RIGHT BUTTON_RIGHT | 139 | #define SUPERDOM_RIGHT BUTTON_RIGHT |
156 | #define SUPERDOM_CANCEL BUTTON_BACK | 140 | #define SUPERDOM_CANCEL BUTTON_BACK |
157 | 141 | ||
158 | #elif CONFIG_KEYPAD == ONDAVX747_PAD | 142 | #elif (CONFIG_KEYPAD == ONDAVX747_PAD) || (CONFIG_KEYPAD == MROBE500_PAD) |
159 | #define SUPERDOM_CANCEL BUTTON_POWER | 143 | #define SUPERDOM_CANCEL BUTTON_POWER |
160 | 144 | ||
161 | #endif | 145 | #endif |