devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Correct superdom conflict

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22547 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Karl Kurbjun 2009-08-29 19:39:46 +00:00
parent 7bb7c5f0cc
commit eb3cb724e8
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
apps/plugins/superdom.c
View file

@ -62,7 +62,7 @@ char buf[255];
/* These parameters define the piece image dimensions, Stride is the total width /* These parameters define the piece image dimensions, Stride is the total width
* of the bitmap. * of the bitmap.
*/ */
#define STRIDE BMPWIDTH_superdom_boarditems #define ICON_STRIDE BMPWIDTH_superdom_boarditems
#define ICON_HEIGHT (BMPHEIGHT_superdom_boarditems/6) #define ICON_HEIGHT (BMPHEIGHT_superdom_boarditems/6)
#define ICON_WIDTH (BMPWIDTH_superdom_boarditems/2) #define ICON_WIDTH (BMPWIDTH_superdom_boarditems/2)
@ -301,7 +301,7 @@ void draw_board(void) {
#endif #endif
if(board[i][j].ind) { if(board[i][j].ind) {
MY_BITMAP_PART(superdom_boarditems, MY_BITMAP_PART(superdom_boarditems,
board[i][j].colour?ICON_WIDTH:0, 0, STRIDE, board[i][j].colour?ICON_WIDTH:0, 0, ICON_STRIDE,
#if LCD_WIDTH > LCD_HEIGHT #if LCD_WIDTH > LCD_HEIGHT
MARGIN+(BOX_WIDTH*(i-1))+1, MARGIN+(BOX_WIDTH*(i-1))+1,
MARGIN+(BOX_HEIGHT*(j-1))+ICON_HEIGHT+1, MARGIN+(BOX_HEIGHT*(j-1))+ICON_HEIGHT+1,
@ -314,14 +314,14 @@ void draw_board(void) {
if(board[i][j].farm) { if(board[i][j].farm) {
MY_BITMAP_PART(superdom_boarditems, MY_BITMAP_PART(superdom_boarditems,
board[i][j].colour?ICON_WIDTH:0, ICON_HEIGHT, board[i][j].colour?ICON_WIDTH:0, ICON_HEIGHT,
STRIDE, MARGIN+(BOX_WIDTH*(i-1))+1, ICON_STRIDE, MARGIN+(BOX_WIDTH*(i-1))+1,
MARGIN+(BOX_HEIGHT*(j-1))+1, MARGIN+(BOX_HEIGHT*(j-1))+1,
ICON_WIDTH, ICON_HEIGHT); ICON_WIDTH, ICON_HEIGHT);
} }
if(board[i][j].tank) { if(board[i][j].tank) {
MY_BITMAP_PART(superdom_boarditems, MY_BITMAP_PART(superdom_boarditems,
board[i][j].colour?ICON_WIDTH:0, ICON_HEIGHT*2, board[i][j].colour?ICON_WIDTH:0, ICON_HEIGHT*2,
STRIDE, MARGIN+(BOX_WIDTH*(i-1))+ICON_WIDTH+1, ICON_STRIDE, MARGIN+(BOX_WIDTH*(i-1))+ICON_WIDTH+1,
MARGIN+(BOX_HEIGHT*(j-1))+ICON_HEIGHT+1, MARGIN+(BOX_HEIGHT*(j-1))+ICON_HEIGHT+1,
ICON_WIDTH, ICON_HEIGHT); ICON_WIDTH, ICON_HEIGHT);
} }
@ -329,10 +329,10 @@ void draw_board(void) {
MY_BITMAP_PART(superdom_boarditems, MY_BITMAP_PART(superdom_boarditems,
board[i][j].colour?ICON_WIDTH:0, ICON_HEIGHT*3, board[i][j].colour?ICON_WIDTH:0, ICON_HEIGHT*3,
#if LCD_WIDTH > LCD_HEIGHT #if LCD_WIDTH > LCD_HEIGHT
STRIDE, MARGIN+(BOX_WIDTH*(i-1))+ICON_WIDTH+1, ICON_STRIDE, MARGIN+(BOX_WIDTH*(i-1))+ICON_WIDTH+1,
MARGIN+(BOX_HEIGHT*(j-1))+1, MARGIN+(BOX_HEIGHT*(j-1))+1,
#else #else
STRIDE, MARGIN+(BOX_WIDTH*(i-1))+1, ICON_STRIDE, MARGIN+(BOX_WIDTH*(i-1))+1,
MARGIN+(BOX_HEIGHT*(j-1))+1+ICON_HEIGHT, MARGIN+(BOX_HEIGHT*(j-1))+1+ICON_HEIGHT,
#endif #endif
ICON_WIDTH, ICON_HEIGHT); ICON_WIDTH, ICON_HEIGHT);
@ -341,10 +341,10 @@ void draw_board(void) {
MY_BITMAP_PART(superdom_boarditems, MY_BITMAP_PART(superdom_boarditems,
board[i][j].colour?ICON_WIDTH:0, ICON_HEIGHT*4, board[i][j].colour?ICON_WIDTH:0, ICON_HEIGHT*4,
#if LCD_WIDTH > LCD_HEIGHT #if LCD_WIDTH > LCD_HEIGHT
STRIDE,MARGIN+(BOX_WIDTH*(i-1))+ICON_WIDTH*2+1, ICON_STRIDE,MARGIN+(BOX_WIDTH*(i-1))+ICON_WIDTH*2+1,
MARGIN+(BOX_HEIGHT*(j-1))+ICON_HEIGHT+1, MARGIN+(BOX_HEIGHT*(j-1))+ICON_HEIGHT+1,
#else #else
STRIDE,MARGIN+(BOX_WIDTH*(i-1))+ICON_WIDTH+1, ICON_STRIDE,MARGIN+(BOX_WIDTH*(i-1))+ICON_WIDTH+1,
MARGIN+(BOX_HEIGHT*(j-1))+ICON_HEIGHT*2+1, MARGIN+(BOX_HEIGHT*(j-1))+ICON_HEIGHT*2+1,
#endif #endif
ICON_WIDTH, ICON_HEIGHT); ICON_WIDTH, ICON_HEIGHT);
@ -353,10 +353,10 @@ void draw_board(void) {
MY_BITMAP_PART(superdom_boarditems, MY_BITMAP_PART(superdom_boarditems,
board[i][j].colour?ICON_WIDTH:0, ICON_HEIGHT*5, board[i][j].colour?ICON_WIDTH:0, ICON_HEIGHT*5,
#if LCD_WIDTH > LCD_HEIGHT #if LCD_WIDTH > LCD_HEIGHT
STRIDE,MARGIN+(BOX_WIDTH*(i-1))+ICON_WIDTH*2+1, ICON_STRIDE,MARGIN+(BOX_WIDTH*(i-1))+ICON_WIDTH*2+1,
MARGIN+(BOX_HEIGHT*(j-1))+1, MARGIN+(BOX_HEIGHT*(j-1))+1,
#else #else
STRIDE,MARGIN+(BOX_WIDTH*(i-1))+1, ICON_STRIDE,MARGIN+(BOX_WIDTH*(i-1))+1,
MARGIN+(BOX_HEIGHT*(j-1))+ICON_HEIGHT*2+1, MARGIN+(BOX_HEIGHT*(j-1))+ICON_HEIGHT*2+1,
#endif #endif
ICON_WIDTH, ICON_HEIGHT); ICON_WIDTH, ICON_HEIGHT);