From a322081e9469dee07f10398941aef5c43913cf68 Mon Sep 17 00:00:00 2001
From: Antoine Cellerier <dionoea@videolan.org>
Date: Thu, 27 Jul 2006 22:04:07 +0000
Subject: Add bitmaps for greyscale LCD targets for "star" game. Closes
 http://www.rockbox.org/tracker/task/5509 (bitmaps are a bit too large for
 ipod mini, but the game is still playable)

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10344 a1c6a512-1295-4272-9138-f99709370657
---
 apps/plugins/bitmaps/native/SOURCES                   |   4 +++-
 apps/plugins/bitmaps/native/star_tiles.10x10.grey.bmp | Bin 0 -> 1678 bytes
 apps/plugins/star.c                                   |  18 +++++++++---------
 3 files changed, 12 insertions(+), 10 deletions(-)
 create mode 100644 apps/plugins/bitmaps/native/star_tiles.10x10.grey.bmp

(limited to 'apps')

diff --git a/apps/plugins/bitmaps/native/SOURCES b/apps/plugins/bitmaps/native/SOURCES
index 2c1c94b167..6b75c1e058 100644
--- a/apps/plugins/bitmaps/native/SOURCES
+++ b/apps/plugins/bitmaps/native/SOURCES
@@ -138,7 +138,7 @@ flipit_tokens.20x20x2.bmp
 #endif
 
 /* Star */
-#ifdef HAVE_LCD_COLOR
+#if defined( HAVE_LCD_COLOR )
 #if LCD_WIDTH >= 320
 star_tiles.20x20.bmp
 #elif LCD_WIDTH >= 220
@@ -146,6 +146,8 @@ star_tiles.13x13.bmp
 #else
 star_tiles.10x10.bmp
 #endif
+#elif LCD_DEPTH > 1
+star_tiles.10x10.grey.bmp
 #endif
 
 /* Solitaire */
diff --git a/apps/plugins/bitmaps/native/star_tiles.10x10.grey.bmp b/apps/plugins/bitmaps/native/star_tiles.10x10.grey.bmp
new file mode 100644
index 0000000000..1333d49c6e
Binary files /dev/null and b/apps/plugins/bitmaps/native/star_tiles.10x10.grey.bmp differ
diff --git a/apps/plugins/star.c b/apps/plugins/star.c
index 2cb380810f..cdaeba1ddb 100644
--- a/apps/plugins/star.c
+++ b/apps/plugins/star.c
@@ -156,14 +156,14 @@ static int control;
 /* the current board */
 static char board[STAR_HEIGHT][STAR_WIDTH];
 
-#ifdef HAVE_LCD_COLOR
+#if LCD_DEPTH > 1
 
 extern const fb_data star_tiles[];
 
 /* size of a tile */
-#if LCD_WIDTH >= 320
+#if LCD_WIDTH >= 320 && defined( HAVE_LCD_COLOR )
 #  define STAR_TILE_SIZE 20
-#elif LCD_WIDTH >= 220
+#elif LCD_WIDTH >= 220 && defined( HAVE_LCD_COLOR )
 #  define STAR_TILE_SIZE 13
 #else
 #  define STAR_TILE_SIZE 10
@@ -565,7 +565,7 @@ static void star_display_board_info(void)
                  current_level, star_count);
     rb->lcd_putsxy(0, label_offset_y, str_info);
 
-#if HAVE_LCD_COLOR
+#if LCD_DEPTH > 1
     if( control == STAR_CONTROL_BALL )
             rb->lcd_bitmap_part( star_tiles, 0,
                                  ball*STAR_TILE_SIZE, STAR_TILE_SIZE,
@@ -612,7 +612,7 @@ static int star_load_level(int current_level)
             board[y][x] = *ptr_tab;
             switch (*ptr_tab)
             {
-#if HAVE_LCD_COLOR
+#if LCD_DEPTH > 1
 #   define DRAW_TILE( a )                                                    \
                     rb->lcd_bitmap_part( star_tiles, 0,                     \
                                          a*STAR_TILE_SIZE, STAR_TILE_SIZE,   \
@@ -627,7 +627,7 @@ static int star_load_level(int current_level)
                                          STAR_TILE_SIZE, STAR_TILE_SIZE);
 #endif
                 case STAR_VOID:
-#ifdef HAVE_LCD_COLOR
+#if LCD_DEPTH > 1
                     DRAW_TILE( space );
 #endif
                     break;
@@ -769,7 +769,7 @@ static int star_run_game(void)
             {
                 for (i = 0 ; i <= STAR_TILE_SIZE ; i++)
                 {
-#if HAVE_LCD_COLOR
+#if LCD_DEPTH > 1
                     rb->lcd_bitmap_part(
                         star_tiles, 0, space * STAR_TILE_SIZE, STAR_TILE_SIZE,
                         STAR_OFFSET_X + ball_x * STAR_TILE_SIZE,
@@ -818,7 +818,7 @@ static int star_run_game(void)
             {
                 for (i = 0 ; i <= STAR_TILE_SIZE ; i++)
                 {
-#if HAVE_LCD_COLOR
+#if LCD_DEPTH > 1
                     rb->lcd_bitmap_part(
                         star_tiles, 0, space * STAR_TILE_SIZE, STAR_TILE_SIZE,
                         STAR_OFFSET_X + block_x * STAR_TILE_SIZE,
@@ -1026,7 +1026,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
     if (char_width == -1)
         rb->lcd_getstringsize("a", &char_width, &char_height);
 
-#ifdef HAVE_LCD_COLOR
+#if LCD_DEPTH > 1
     rb->lcd_set_background( LCD_BLACK );
     rb->lcd_set_foreground( LCD_WHITE );
 #endif
-- 
cgit v1.2.3