From e633bc0be91173e546031a9adf3c006013c13d88 Mon Sep 17 00:00:00 2001 From: Tom Ross Date: Mon, 12 Feb 2007 04:21:49 +0000 Subject: [PATCH] Rename solitaire_ bitmaps to card_ since they are used in solitaire and blackjack. Ideally all future card games will use these graphics. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12281 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/bitmaps/native/SOURCES | 30 +++++++++--------- ...back.13x13x1.bmp => card_back.13x13x1.bmp} | Bin ...ck.15x20x16.bmp => card_back.15x20x16.bmp} | Bin ...back.15x20x2.bmp => card_back.15x20x2.bmp} | Bin ...ck.18x23x16.bmp => card_back.18x23x16.bmp} | Bin ...back.18x23x2.bmp => card_back.18x23x2.bmp} | Bin ...ck.26x33x16.bmp => card_back.26x33x16.bmp} | Bin ...ck.37x49x16.bmp => card_back.37x49x16.bmp} | Bin ...ck.169x52x1.bmp => card_deck.169x52x1.bmp} | Bin ....195x80x16.bmp => card_deck.195x80x16.bmp} | Bin ...ck.195x80x2.bmp => card_deck.195x80x2.bmp} | Bin ....234x92x16.bmp => card_deck.234x92x16.bmp} | Bin ...ck.234x92x2.bmp => card_deck.234x92x2.bmp} | Bin ...38x132x16.bmp => card_deck.338x132x16.bmp} | Bin ...81x196x16.bmp => card_deck.481x196x16.bmp} | Bin apps/plugins/blackjack.c | 18 +++++------ apps/plugins/solitaire.c | 18 +++++------ 17 files changed, 33 insertions(+), 33 deletions(-) rename apps/plugins/bitmaps/native/{solitaire_cardback.13x13x1.bmp => card_back.13x13x1.bmp} (100%) rename apps/plugins/bitmaps/native/{solitaire_cardback.15x20x16.bmp => card_back.15x20x16.bmp} (100%) rename apps/plugins/bitmaps/native/{solitaire_cardback.15x20x2.bmp => card_back.15x20x2.bmp} (100%) rename apps/plugins/bitmaps/native/{solitaire_cardback.18x23x16.bmp => card_back.18x23x16.bmp} (100%) rename apps/plugins/bitmaps/native/{solitaire_cardback.18x23x2.bmp => card_back.18x23x2.bmp} (100%) rename apps/plugins/bitmaps/native/{solitaire_cardback.26x33x16.bmp => card_back.26x33x16.bmp} (100%) rename apps/plugins/bitmaps/native/{solitaire_cardback.37x49x16.bmp => card_back.37x49x16.bmp} (100%) rename apps/plugins/bitmaps/native/{solitaire_deck.169x52x1.bmp => card_deck.169x52x1.bmp} (100%) rename apps/plugins/bitmaps/native/{solitaire_deck.195x80x16.bmp => card_deck.195x80x16.bmp} (100%) rename apps/plugins/bitmaps/native/{solitaire_deck.195x80x2.bmp => card_deck.195x80x2.bmp} (100%) rename apps/plugins/bitmaps/native/{solitaire_deck.234x92x16.bmp => card_deck.234x92x16.bmp} (100%) rename apps/plugins/bitmaps/native/{solitaire_deck.234x92x2.bmp => card_deck.234x92x2.bmp} (100%) rename apps/plugins/bitmaps/native/{solitaire_deck.338x132x16.bmp => card_deck.338x132x16.bmp} (100%) rename apps/plugins/bitmaps/native/{solitaire_deck.481x196x16.bmp => card_deck.481x196x16.bmp} (100%) diff --git a/apps/plugins/bitmaps/native/SOURCES b/apps/plugins/bitmaps/native/SOURCES index b336f407e4..86080bb143 100644 --- a/apps/plugins/bitmaps/native/SOURCES +++ b/apps/plugins/bitmaps/native/SOURCES @@ -274,39 +274,39 @@ sokoban_tiles.6x6.bmp sokoban_tiles.6x6x2.bmp #endif -/* Solitaire */ +/* Solitaire and Blackjack */ #ifdef HAVE_LCD_COLOR #if LCD_WIDTH >= 320 -solitaire_cardback.37x49x16.bmp -solitaire_deck.481x196x16.bmp +card_back.37x49x16.bmp +card_deck.481x196x16.bmp solitaire_suitsi.37x196x16.bmp #elif LCD_WIDTH >= 220 -solitaire_cardback.26x33x16.bmp -solitaire_deck.338x132x16.bmp +card_back.26x33x16.bmp +card_deck.338x132x16.bmp solitaire_suitsi.26x132x16.bmp #elif LCD_WIDTH >= 160 -solitaire_cardback.18x23x16.bmp -solitaire_deck.234x92x16.bmp +card_back.18x23x16.bmp +card__deck.234x92x16.bmp solitaire_suitsi.18x92x16.bmp #elif LCD_WIDTH >= 128 -solitaire_cardback.15x20x16.bmp -solitaire_deck.195x80x16.bmp +card_back.15x20x16.bmp +card__deck.195x80x16.bmp solitaire_suitsi.15x80x16.bmp #endif #elif LCD_DEPTH > 1 /* greyscale */ #if LCD_WIDTH >= 160 -solitaire_cardback.18x23x2.bmp -solitaire_deck.234x92x2.bmp +card_back.18x23x2.bmp +card_deck.234x92x2.bmp solitaire_suitsi.18x92x2.bmp #elif LCD_WIDTH >= 128 -solitaire_cardback.15x20x2.bmp -solitaire_deck.195x80x2.bmp +card_back.15x20x2.bmp +card_deck.195x80x2.bmp solitaire_suitsi.15x80x2.bmp #endif #else /* monochrome */ #if LCD_WIDTH >= 112 -solitaire_cardback.13x13x1.bmp -solitaire_deck.169x52x1.bmp +card_back.13x13x1.bmp +card_deck.169x52x1.bmp solitaire_suitsi.13x52x1.bmp #endif #endif diff --git a/apps/plugins/bitmaps/native/solitaire_cardback.13x13x1.bmp b/apps/plugins/bitmaps/native/card_back.13x13x1.bmp similarity index 100% rename from apps/plugins/bitmaps/native/solitaire_cardback.13x13x1.bmp rename to apps/plugins/bitmaps/native/card_back.13x13x1.bmp diff --git a/apps/plugins/bitmaps/native/solitaire_cardback.15x20x16.bmp b/apps/plugins/bitmaps/native/card_back.15x20x16.bmp similarity index 100% rename from apps/plugins/bitmaps/native/solitaire_cardback.15x20x16.bmp rename to apps/plugins/bitmaps/native/card_back.15x20x16.bmp diff --git a/apps/plugins/bitmaps/native/solitaire_cardback.15x20x2.bmp b/apps/plugins/bitmaps/native/card_back.15x20x2.bmp similarity index 100% rename from apps/plugins/bitmaps/native/solitaire_cardback.15x20x2.bmp rename to apps/plugins/bitmaps/native/card_back.15x20x2.bmp diff --git a/apps/plugins/bitmaps/native/solitaire_cardback.18x23x16.bmp b/apps/plugins/bitmaps/native/card_back.18x23x16.bmp similarity index 100% rename from apps/plugins/bitmaps/native/solitaire_cardback.18x23x16.bmp rename to apps/plugins/bitmaps/native/card_back.18x23x16.bmp diff --git a/apps/plugins/bitmaps/native/solitaire_cardback.18x23x2.bmp b/apps/plugins/bitmaps/native/card_back.18x23x2.bmp similarity index 100% rename from apps/plugins/bitmaps/native/solitaire_cardback.18x23x2.bmp rename to apps/plugins/bitmaps/native/card_back.18x23x2.bmp diff --git a/apps/plugins/bitmaps/native/solitaire_cardback.26x33x16.bmp b/apps/plugins/bitmaps/native/card_back.26x33x16.bmp similarity index 100% rename from apps/plugins/bitmaps/native/solitaire_cardback.26x33x16.bmp rename to apps/plugins/bitmaps/native/card_back.26x33x16.bmp diff --git a/apps/plugins/bitmaps/native/solitaire_cardback.37x49x16.bmp b/apps/plugins/bitmaps/native/card_back.37x49x16.bmp similarity index 100% rename from apps/plugins/bitmaps/native/solitaire_cardback.37x49x16.bmp rename to apps/plugins/bitmaps/native/card_back.37x49x16.bmp diff --git a/apps/plugins/bitmaps/native/solitaire_deck.169x52x1.bmp b/apps/plugins/bitmaps/native/card_deck.169x52x1.bmp similarity index 100% rename from apps/plugins/bitmaps/native/solitaire_deck.169x52x1.bmp rename to apps/plugins/bitmaps/native/card_deck.169x52x1.bmp diff --git a/apps/plugins/bitmaps/native/solitaire_deck.195x80x16.bmp b/apps/plugins/bitmaps/native/card_deck.195x80x16.bmp similarity index 100% rename from apps/plugins/bitmaps/native/solitaire_deck.195x80x16.bmp rename to apps/plugins/bitmaps/native/card_deck.195x80x16.bmp diff --git a/apps/plugins/bitmaps/native/solitaire_deck.195x80x2.bmp b/apps/plugins/bitmaps/native/card_deck.195x80x2.bmp similarity index 100% rename from apps/plugins/bitmaps/native/solitaire_deck.195x80x2.bmp rename to apps/plugins/bitmaps/native/card_deck.195x80x2.bmp diff --git a/apps/plugins/bitmaps/native/solitaire_deck.234x92x16.bmp b/apps/plugins/bitmaps/native/card_deck.234x92x16.bmp similarity index 100% rename from apps/plugins/bitmaps/native/solitaire_deck.234x92x16.bmp rename to apps/plugins/bitmaps/native/card_deck.234x92x16.bmp diff --git a/apps/plugins/bitmaps/native/solitaire_deck.234x92x2.bmp b/apps/plugins/bitmaps/native/card_deck.234x92x2.bmp similarity index 100% rename from apps/plugins/bitmaps/native/solitaire_deck.234x92x2.bmp rename to apps/plugins/bitmaps/native/card_deck.234x92x2.bmp diff --git a/apps/plugins/bitmaps/native/solitaire_deck.338x132x16.bmp b/apps/plugins/bitmaps/native/card_deck.338x132x16.bmp similarity index 100% rename from apps/plugins/bitmaps/native/solitaire_deck.338x132x16.bmp rename to apps/plugins/bitmaps/native/card_deck.338x132x16.bmp diff --git a/apps/plugins/bitmaps/native/solitaire_deck.481x196x16.bmp b/apps/plugins/bitmaps/native/card_deck.481x196x16.bmp similarity index 100% rename from apps/plugins/bitmaps/native/solitaire_deck.481x196x16.bmp rename to apps/plugins/bitmaps/native/card_deck.481x196x16.bmp diff --git a/apps/plugins/blackjack.c b/apps/plugins/blackjack.c index 0f81d11385..a4c22797e8 100644 --- a/apps/plugins/blackjack.c +++ b/apps/plugins/blackjack.c @@ -18,8 +18,8 @@ ****************************************************************************/ #include "plugin.h" -#include "solitaire_deck.h" -#include "solitaire_cardback.h" +#include "card_deck.h" +#include "card_back.h" PLUGIN_HEADER @@ -199,14 +199,14 @@ PLUGIN_HEADER #define FG_COLOR LCD_BLACK #endif -#define CARD_WIDTH BMPWIDTH_solitaire_cardback -#define CARD_HEIGHT BMPHEIGHT_solitaire_cardback +#define CARD_WIDTH BMPWIDTH_card_back +#define CARD_HEIGHT BMPHEIGHT_card_back /* This is the max amount of cards onscreen before condensing */ #define MAX_CARDS LCD_WIDTH/(CARD_WIDTH+4) -extern const fb_data solitaire_deck[]; -extern const fb_data solitaire_cardback[]; +extern const fb_data card_deck[]; +extern const fb_data card_back[]; #define NEXT_CARD bj->player_cards[done][bj->num_player_cards[done]] @@ -332,11 +332,11 @@ static unsigned int find_value(unsigned int number) { static void draw_card(struct card temp_card, bool shown, unsigned int x, unsigned int y) { if(shown) - rb->lcd_bitmap_part(solitaire_deck, CARD_WIDTH*temp_card.num, - CARD_HEIGHT*temp_card.suit, BMPWIDTH_solitaire_deck, + rb->lcd_bitmap_part(card_deck, CARD_WIDTH*temp_card.num, + CARD_HEIGHT*temp_card.suit, BMPWIDTH_card_deck, x+1, y+1, CARD_WIDTH, CARD_HEIGHT); else - rb->lcd_bitmap(solitaire_cardback, x+1, y+1,CARD_WIDTH, CARD_HEIGHT); + rb->lcd_bitmap(card_back, x+1, y+1,CARD_WIDTH, CARD_HEIGHT); #if LCD_DEPTH > 1 rb->lcd_set_foreground(LCD_BLACK); #endif diff --git a/apps/plugins/solitaire.c b/apps/plugins/solitaire.c index 835c3ab906..5283e40f4b 100644 --- a/apps/plugins/solitaire.c +++ b/apps/plugins/solitaire.c @@ -264,14 +264,14 @@ static char helptext[] = * Misc constants, graphics and other defines */ -#include "solitaire_cardback.h" -#include "solitaire_deck.h" +#include "card_back.h" +#include "card_deck.h" #include "solitaire_suitsi.h" -#define CARD_GFX_WIDTH BMPWIDTH_solitaire_cardback -#define CARD_GFX_HEIGHT BMPHEIGHT_solitaire_cardback -#define CARD_WIDTH (BMPWIDTH_solitaire_cardback+2) -#define CARD_HEIGHT (BMPHEIGHT_solitaire_cardback+2) +#define CARD_GFX_WIDTH BMPWIDTH_card_back +#define CARD_GFX_HEIGHT BMPHEIGHT_card_back +#define CARD_WIDTH (BMPWIDTH_card_back+2) +#define CARD_HEIGHT (BMPHEIGHT_card_back+2) #if LCD_WIDTH >= 320 # define MARGIN 4 @@ -405,13 +405,13 @@ static void draw_card( card_t *card, int x, int y, { if( card->known ) { - rb->lcd_bitmap_part( solitaire_deck, CARD_GFX_WIDTH * card->num, - CARD_GFX_HEIGHT * card->suit, BMPWIDTH_solitaire_deck, + rb->lcd_bitmap_part( card_deck, CARD_GFX_WIDTH * card->num, + CARD_GFX_HEIGHT * card->suit, BMPWIDTH_card_deck, x+1, y+1, CARD_GFX_WIDTH, CARD_GFX_HEIGHT ); } else { - rb->lcd_bitmap( solitaire_cardback, x+1, y+1, + rb->lcd_bitmap( card_back, x+1, y+1, CARD_GFX_WIDTH, CARD_GFX_HEIGHT ); } draw_card_ext( x, y, selected, cursor );