summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarl Kurbjun <kkurbjun@gmail.com>2009-07-21 03:52:59 +0000
committerKarl Kurbjun <kkurbjun@gmail.com>2009-07-21 03:52:59 +0000
commit70deae01ffd67ec350e7f36bccfd0cf53265b5ef (patch)
tree7da99aeab5df2071219f3f0e89a176fddfba0dc8
parentdebfd39882896e167e45950ce08ccb2934be529c (diff)
downloadrockbox-70deae01ffd67ec350e7f36bccfd0cf53265b5ef.tar.gz
rockbox-70deae01ffd67ec350e7f36bccfd0cf53265b5ef.tar.bz2
rockbox-70deae01ffd67ec350e7f36bccfd0cf53265b5ef.zip
Star, Flipit, Rockblox, Sokoban, Wormlet: Add support for 640x480 screens
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21990 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/plugins/bitmaps/native/SOURCES6
-rw-r--r--apps/plugins/bitmaps/native/flipit_cursor.112x112x16.bmpbin0 -> 50230 bytes
-rw-r--r--apps/plugins/bitmaps/native/flipit_tokens.112x224x16.bmpbin0 -> 100406 bytes
-rw-r--r--apps/plugins/bitmaps/native/rockblox_background.640x480x16.bmpbin0 -> 921654 bytes
-rw-r--r--apps/plugins/bitmaps/native/sokoban_tiles.28x28x16.bmpbin0 -> 22006 bytes
-rw-r--r--apps/plugins/bitmaps/native/star_tiles.40x40.bmpbin0 -> 24054 bytes
-rw-r--r--apps/plugins/rockblox.c26
-rw-r--r--apps/plugins/wormlet.c10
8 files changed, 20 insertions, 22 deletions
diff --git a/apps/plugins/bitmaps/native/SOURCES b/apps/plugins/bitmaps/native/SOURCES
index be42e539f2..8c652b2fdf 100644
--- a/apps/plugins/bitmaps/native/SOURCES
+++ b/apps/plugins/bitmaps/native/SOURCES
@@ -431,7 +431,9 @@ pegbox_pieces.9x7x1.bmp
/* Rockblox */
#if LCD_DEPTH == 16 /* colour versions*/
-#if (LCD_WIDTH >= 320) && (LCD_HEIGHT >= 240)
+#if (LCD_WIDTH == 640) && (LCD_HEIGHT == 480)
+rockblox_background.640x480x16.bmp
+#elif (LCD_WIDTH >= 320) && (LCD_HEIGHT >= 240)
rockblox_background.320x240x16.bmp
#elif (LCD_WIDTH == 240) && (LCD_HEIGHT >= 320)
rockblox_background.240x320x16.bmp
@@ -526,7 +528,7 @@ snake2_bottom.160x128x2.bmp
#endif
#ifdef HAVE_LCD_COLOR
-#if SOKOBAN_TILESIZE >= 14
+#if SOKOBAN_TILESIZE >= 28
sokoban_tiles.28x28x16.bmp
#elif SOKOBAN_TILESIZE >= 14
sokoban_tiles.14x14x16.bmp
diff --git a/apps/plugins/bitmaps/native/flipit_cursor.112x112x16.bmp b/apps/plugins/bitmaps/native/flipit_cursor.112x112x16.bmp
new file mode 100644
index 0000000000..dd5c4cc31a
--- /dev/null
+++ b/apps/plugins/bitmaps/native/flipit_cursor.112x112x16.bmp
Binary files differ
diff --git a/apps/plugins/bitmaps/native/flipit_tokens.112x224x16.bmp b/apps/plugins/bitmaps/native/flipit_tokens.112x224x16.bmp
new file mode 100644
index 0000000000..819db936c1
--- /dev/null
+++ b/apps/plugins/bitmaps/native/flipit_tokens.112x224x16.bmp
Binary files differ
diff --git a/apps/plugins/bitmaps/native/rockblox_background.640x480x16.bmp b/apps/plugins/bitmaps/native/rockblox_background.640x480x16.bmp
new file mode 100644
index 0000000000..209941a8f5
--- /dev/null
+++ b/apps/plugins/bitmaps/native/rockblox_background.640x480x16.bmp
Binary files differ
diff --git a/apps/plugins/bitmaps/native/sokoban_tiles.28x28x16.bmp b/apps/plugins/bitmaps/native/sokoban_tiles.28x28x16.bmp
new file mode 100644
index 0000000000..b3523a28f1
--- /dev/null
+++ b/apps/plugins/bitmaps/native/sokoban_tiles.28x28x16.bmp
Binary files differ
diff --git a/apps/plugins/bitmaps/native/star_tiles.40x40.bmp b/apps/plugins/bitmaps/native/star_tiles.40x40.bmp
new file mode 100644
index 0000000000..a2a16516df
--- /dev/null
+++ b/apps/plugins/bitmaps/native/star_tiles.40x40.bmp
Binary files differ
diff --git a/apps/plugins/rockblox.c b/apps/plugins/rockblox.c
index 9b4987747d..f3857c35fc 100644
--- a/apps/plugins/rockblox.c
+++ b/apps/plugins/rockblox.c
@@ -329,19 +329,16 @@ PLUGIN_HEADER
#if (LCD_WIDTH == 640) && (LCD_HEIGHT == 480)
-#define BLOCK_WIDTH 30
-#define BLOCK_HEIGHT 30
-#define BOARD_X 14
-#define BOARD_Y 2
-#define PREVIEW_X 342
-#define PREVIEW_Y 482
-#define LABEL_X 344
-#define SCORE_Y 58
-#define LEVEL_Y 142
-#define LINES_Y 218
-#define HIGH_LABEL_X 344
-#define HIGH_SCORE_Y 326
-#define HIGH_LEVEL_Y 344
+#define BLOCK_WIDTH 24
+#define BLOCK_HEIGHT 24
+#define BOARD_X 172
+#define BOARD_Y 0
+#define PREVIEW_X 24
+#define PREVIEW_Y 22
+#define LABEL_X 482
+#define SCORE_Y 50
+#define LEVEL_Y 140
+#define LINES_Y 210
#elif (LCD_WIDTH == 480) && (LCD_HEIGHT == 640)
@@ -355,9 +352,6 @@ PLUGIN_HEADER
#define SCORE_Y 58
#define LEVEL_Y 142
#define LINES_Y 218
-#define HIGH_LABEL_X 344
-#define HIGH_SCORE_Y 326
-#define HIGH_LEVEL_Y 344
#elif (LCD_WIDTH == 320) && (LCD_HEIGHT == 240)
diff --git a/apps/plugins/wormlet.c b/apps/plugins/wormlet.c
index 4cc3d5cec1..2ef9f990f4 100644
--- a/apps/plugins/wormlet.c
+++ b/apps/plugins/wormlet.c
@@ -376,14 +376,16 @@ PLUGIN_HEADER
#define ARGH_SIZE 6
#define SPEED 4
#define MAX_WORM_SEGMENTS 512
-#elif (LCD_WIDTH == 320) && (LCD_HEIGHT == 240)
+#elif ((LCD_WIDTH == 320) && (LCD_HEIGHT == 240)) || \
+ ((LCD_WIDTH == 240) && ((LCD_HEIGHT == 320) || (LCD_HEIGHT == 400)))
#define FOOD_SIZE 7
#define ARGH_SIZE 8
#define SPEED 4
#define MAX_WORM_SEGMENTS 512
-#elif (LCD_WIDTH == 240) && ((LCD_HEIGHT == 320) || (LCD_HEIGHT == 400))
-#define FOOD_SIZE 7
-#define ARGH_SIZE 8
+#elif ((LCD_WIDTH == 640) && (LCD_HEIGHT == 480)) || \
+ ((LCD_WIDTH == 480) && (LCD_HEIGHT == 640))
+#define FOOD_SIZE 14
+#define ARGH_SIZE 16
#define SPEED 4
#define MAX_WORM_SEGMENTS 512
#endif