diff options
author | Antoine Cellerier <dionoea@videolan.org> | 2006-09-02 22:45:27 +0000 |
---|---|---|
committer | Antoine Cellerier <dionoea@videolan.org> | 2006-09-02 22:45:27 +0000 |
commit | cf605c34349f5519135dc9206df2c049745b16c4 (patch) | |
tree | e26cc38be60c99f4af1feb5398eb7620f66aaaf0 /apps | |
parent | 55a3018cdd246168cf6b8286032383e7831226ad (diff) | |
download | rockbox-cf605c34349f5519135dc9206df2c049745b16c4.tar.gz rockbox-cf605c34349f5519135dc9206df2c049745b16c4.zip |
Fix solitaire card colors
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10861 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/plugins/bitmaps/mono/SOURCES | 18 | ||||
-rw-r--r-- | apps/plugins/bitmaps/mono/solitaire_numbers.6x6x1.bmp (renamed from apps/plugins/bitmaps/native/solitaire_numbers.6x6x1.bmp) | bin | 374 -> 374 bytes | |||
-rw-r--r-- | apps/plugins/bitmaps/mono/solitaire_numbers.8x10x1.bmp (renamed from apps/plugins/bitmaps/native/solitaire_numbers.8x10x1.bmp) | bin | 582 -> 582 bytes | |||
-rw-r--r-- | apps/plugins/bitmaps/mono/solitaire_suits.6x6x1.bmp (renamed from apps/plugins/bitmaps/native/solitaire_suits.6x6x1.bmp) | bin | 158 -> 158 bytes | |||
-rw-r--r-- | apps/plugins/bitmaps/mono/solitaire_suits.8x10x1.bmp (renamed from apps/plugins/bitmaps/native/solitaire_suits.8x10x1.bmp) | bin | 222 -> 222 bytes | |||
-rw-r--r-- | apps/plugins/bitmaps/mono/solitaire_suits.8x10x1_filled.bmp | bin | 0 -> 222 bytes | |||
-rw-r--r-- | apps/plugins/bitmaps/mono/solitaire_suitsi.15x16x1.bmp (renamed from apps/plugins/bitmaps/native/solitaire_suitsi.15x16x1.bmp) | bin | 318 -> 318 bytes | |||
-rw-r--r-- | apps/plugins/bitmaps/mono/solitaire_suitsi.15x16x1_filled.bmp | bin | 0 -> 318 bytes | |||
-rw-r--r-- | apps/plugins/bitmaps/native/SOURCES | 15 | ||||
-rw-r--r-- | apps/plugins/bitmaps/native/solitaire_suits.8x10x16.bmp | bin | 1014 -> 0 bytes | |||
-rw-r--r-- | apps/plugins/bitmaps/native/solitaire_suitsi.15x16x16.bmp | bin | 3126 -> 0 bytes | |||
-rw-r--r-- | apps/plugins/solitaire.c | 37 |
12 files changed, 46 insertions, 24 deletions
diff --git a/apps/plugins/bitmaps/mono/SOURCES b/apps/plugins/bitmaps/mono/SOURCES index 82bab1be12..0fbc4766d1 100644 --- a/apps/plugins/bitmaps/mono/SOURCES +++ b/apps/plugins/bitmaps/mono/SOURCES @@ -31,4 +31,22 @@ brickmania_powerups.112x64x1.bmp tetrox_background.112x64x1.bmp #endif +/* Solitaire */ +#if LCD_HEIGHT > 64 +solitaire_numbers.8x10x1.bmp +#if HAVE_LCD_COLOR +solitaire_suits.8x10x1_filled.bmp +#else +solitaire_suits.8x10x1.bmp +#endif +#else +solitaire_numbers.6x6x1.bmp +solitaire_suits.6x6x1.bmp +#endif +#if HAVE_LCD_COLOR +solitaire_suitsi.15x16x1_filled.bmp +#else +solitaire_suitsi.15x16x1.bmp +#endif + #endif /* HAVE_LCD_BITMAP */ diff --git a/apps/plugins/bitmaps/native/solitaire_numbers.6x6x1.bmp b/apps/plugins/bitmaps/mono/solitaire_numbers.6x6x1.bmp Binary files differindex 67884fe741..67884fe741 100644 --- a/apps/plugins/bitmaps/native/solitaire_numbers.6x6x1.bmp +++ b/apps/plugins/bitmaps/mono/solitaire_numbers.6x6x1.bmp diff --git a/apps/plugins/bitmaps/native/solitaire_numbers.8x10x1.bmp b/apps/plugins/bitmaps/mono/solitaire_numbers.8x10x1.bmp Binary files differindex 228532b54b..228532b54b 100644 --- a/apps/plugins/bitmaps/native/solitaire_numbers.8x10x1.bmp +++ b/apps/plugins/bitmaps/mono/solitaire_numbers.8x10x1.bmp diff --git a/apps/plugins/bitmaps/native/solitaire_suits.6x6x1.bmp b/apps/plugins/bitmaps/mono/solitaire_suits.6x6x1.bmp Binary files differindex 67ec92e113..67ec92e113 100644 --- a/apps/plugins/bitmaps/native/solitaire_suits.6x6x1.bmp +++ b/apps/plugins/bitmaps/mono/solitaire_suits.6x6x1.bmp diff --git a/apps/plugins/bitmaps/native/solitaire_suits.8x10x1.bmp b/apps/plugins/bitmaps/mono/solitaire_suits.8x10x1.bmp Binary files differindex 444a63e0a0..444a63e0a0 100644 --- a/apps/plugins/bitmaps/native/solitaire_suits.8x10x1.bmp +++ b/apps/plugins/bitmaps/mono/solitaire_suits.8x10x1.bmp diff --git a/apps/plugins/bitmaps/mono/solitaire_suits.8x10x1_filled.bmp b/apps/plugins/bitmaps/mono/solitaire_suits.8x10x1_filled.bmp Binary files differnew file mode 100644 index 0000000000..497dcae149 --- /dev/null +++ b/apps/plugins/bitmaps/mono/solitaire_suits.8x10x1_filled.bmp diff --git a/apps/plugins/bitmaps/native/solitaire_suitsi.15x16x1.bmp b/apps/plugins/bitmaps/mono/solitaire_suitsi.15x16x1.bmp Binary files differindex ba8fad0a92..ba8fad0a92 100644 --- a/apps/plugins/bitmaps/native/solitaire_suitsi.15x16x1.bmp +++ b/apps/plugins/bitmaps/mono/solitaire_suitsi.15x16x1.bmp diff --git a/apps/plugins/bitmaps/mono/solitaire_suitsi.15x16x1_filled.bmp b/apps/plugins/bitmaps/mono/solitaire_suitsi.15x16x1_filled.bmp Binary files differnew file mode 100644 index 0000000000..541bfc0688 --- /dev/null +++ b/apps/plugins/bitmaps/mono/solitaire_suitsi.15x16x1_filled.bmp diff --git a/apps/plugins/bitmaps/native/SOURCES b/apps/plugins/bitmaps/native/SOURCES index 7ddb042def..8df3bef608 100644 --- a/apps/plugins/bitmaps/native/SOURCES +++ b/apps/plugins/bitmaps/native/SOURCES @@ -158,21 +158,6 @@ solitaire_cardback.220x176x16.bmp solitaire_cardback.176x132x16.bmp #endif #endif -#if defined( HAVE_LCD_COLOR ) -solitaire_numbers.8x10x1.bmp -solitaire_suits.8x10x16.bmp -#elif LCD_HEIGHT > 64 -solitaire_numbers.8x10x1.bmp -solitaire_suits.8x10x1.bmp -#else -solitaire_numbers.6x6x1.bmp -solitaire_suits.6x6x1.bmp -#endif -#ifdef HAVE_LCD_COLOR -solitaire_suitsi.15x16x16.bmp -#else -solitaire_suitsi.15x16x1.bmp -#endif /* Sudoku */ #if LCD_WIDTH >= LCD_HEIGHT diff --git a/apps/plugins/bitmaps/native/solitaire_suits.8x10x16.bmp b/apps/plugins/bitmaps/native/solitaire_suits.8x10x16.bmp Binary files differdeleted file mode 100644 index df8ad2e8b2..0000000000 --- a/apps/plugins/bitmaps/native/solitaire_suits.8x10x16.bmp +++ /dev/null diff --git a/apps/plugins/bitmaps/native/solitaire_suitsi.15x16x16.bmp b/apps/plugins/bitmaps/native/solitaire_suitsi.15x16x16.bmp Binary files differdeleted file mode 100644 index 530921db3d..0000000000 --- a/apps/plugins/bitmaps/native/solitaire_suitsi.15x16x16.bmp +++ /dev/null diff --git a/apps/plugins/solitaire.c b/apps/plugins/solitaire.c index 0f0f56e14a..8d6890db83 100644 --- a/apps/plugins/solitaire.c +++ b/apps/plugins/solitaire.c @@ -265,15 +265,15 @@ static struct plugin_api* rb; #define draw_number( num, x, y ) \ - rb->lcd_bitmap_part( numbers, 0, num * NUMBER_HEIGHT, NUMBER_STRIDE, \ - x, y, NUMBER_WIDTH, NUMBER_HEIGHT ); -extern const fb_data solitaire_numbers[]; + rb->lcd_mono_bitmap_part( numbers, 0, num * NUMBER_HEIGHT, NUMBER_STRIDE, \ + x, y, NUMBER_WIDTH, NUMBER_HEIGHT ); +extern const unsigned char solitaire_numbers[]; #define numbers solitaire_numbers #define draw_suit( num, x, y ) \ - rb->lcd_bitmap_part( suits, 0, num * SUIT_HEIGHT, SUIT_STRIDE, \ - x, y, SUIT_WIDTH, SUIT_HEIGHT ); -extern const fb_data solitaire_suits[]; + rb->lcd_mono_bitmap_part( suits, 0, num * SUIT_HEIGHT, SUIT_STRIDE, \ + x, y, SUIT_WIDTH, SUIT_HEIGHT ); +extern const unsigned char solitaire_suits[]; #define suits solitaire_suits #if ( CARD_HEIGHT < SUITI_HEIGHT + 1 ) || ( CARD_WIDTH < SUITI_WIDTH + 1 ) @@ -284,9 +284,9 @@ extern const fb_data solitaire_suits[]; # define draw_suiti( num, x, y ) draw_suit( num, x, y ) #else # define draw_suiti( num, x, y ) \ - rb->lcd_bitmap_part( suitsi, 0, num * SUITI_HEIGHT, SUITI_STRIDE, \ - x, y, SUITI_WIDTH, SUITI_HEIGHT ); - extern const fb_data solitaire_suitsi[]; + rb->lcd_mono_bitmap_part( suitsi, 0, num * SUITI_HEIGHT, SUITI_STRIDE, \ + x, y, SUITI_WIDTH, SUITI_HEIGHT ); + extern const unsigned char solitaire_suitsi[]; # define suitsi solitaire_suitsi #endif @@ -302,6 +302,16 @@ extern const fb_data solitaire_suits[]; extern const fb_data solitaire_cardback[]; #endif +#if HAVE_LCD_COLOR + static const unsigned colors[4] = { + LCD_BLACK, LCD_RGBPACK(255, 0, 0), LCD_BLACK, LCD_RGBPACK(255, 0, 0) + }; +#elif LCD_DEPTH > 1 + static const unsigned colors[4] = { + LCD_BLACK, LCD_BRIGHTNESS(127), LCD_BLACK, LCD_BRIGHTNESS(127) + }; +#endif + #define CONFIG_FILENAME "sol.cfg" #define NOT_A_CARD 255 @@ -403,6 +413,10 @@ static void draw_card( card_t card, int x, int y, rb->lcd_set_foreground( LCD_WHITE ); rb->lcd_fillrect( x+1, y+1, CARD_WIDTH-1, CARD_HEIGHT-1 ); #endif + +#if LCD_DEPTH > 1 + rb->lcd_set_foreground( colors[card.suit] ); +#endif if( leftstyle ) { #if UPPER_ROW_MARGIN > 0 @@ -442,6 +456,11 @@ static void draw_empty_stack( int s, int x, int y, bool cursor ) #if LCD_DEPTH == 1 rb->lcd_set_drawmode( DRMODE_SOLID ); #endif + +#if LCD_DEPTH > 1 + rb->lcd_set_foreground( colors[s] ); +#endif + draw_suiti( s, x+(CARD_WIDTH-SUITI_WIDTH)/2, y+(CARD_HEIGHT-SUITI_HEIGHT)/2 ); |