diff options
| author | Karl Kurbjun <kkurbjun@gmail.com> | 2009-08-29 19:39:46 +0000 |
|---|---|---|
| committer | Karl Kurbjun <kkurbjun@gmail.com> | 2009-08-29 19:39:46 +0000 |
| commit | eb3cb724e8d4b60f20356944173e7cddddb51398 (patch) | |
| tree | 0e3c28248b5d9514ce7aad4d5e735ca427b8078e /apps/plugins/superdom.c | |
| parent | 7bb7c5f0cc7bf5b5172aeb4d75ef886b19755863 (diff) | |
| download | rockbox-eb3cb724e8d4b60f20356944173e7cddddb51398.zip rockbox-eb3cb724e8d4b60f20356944173e7cddddb51398.tar.gz rockbox-eb3cb724e8d4b60f20356944173e7cddddb51398.tar.bz2 rockbox-eb3cb724e8d4b60f20356944173e7cddddb51398.tar.xz | |
Correct superdom conflict
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22547 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins/superdom.c')
| -rw-r--r-- | apps/plugins/superdom.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/apps/plugins/superdom.c b/apps/plugins/superdom.c index dc07817..d9c857d 100644 --- a/apps/plugins/superdom.c +++ b/apps/plugins/superdom.c @@ -62,7 +62,7 @@ char buf[255]; /* These parameters define the piece image dimensions, Stride is the total width * of the bitmap. */ -#define STRIDE BMPWIDTH_superdom_boarditems +#define ICON_STRIDE BMPWIDTH_superdom_boarditems #define ICON_HEIGHT (BMPHEIGHT_superdom_boarditems/6) #define ICON_WIDTH (BMPWIDTH_superdom_boarditems/2) @@ -301,7 +301,7 @@ void draw_board(void) { #endif if(board[i][j].ind) { 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 MARGIN+(BOX_WIDTH*(i-1))+1, MARGIN+(BOX_HEIGHT*(j-1))+ICON_HEIGHT+1, @@ -314,14 +314,14 @@ void draw_board(void) { if(board[i][j].farm) { MY_BITMAP_PART(superdom_boarditems, 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, ICON_WIDTH, ICON_HEIGHT); } if(board[i][j].tank) { MY_BITMAP_PART(superdom_boarditems, 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, ICON_WIDTH, ICON_HEIGHT); } @@ -329,10 +329,10 @@ void draw_board(void) { MY_BITMAP_PART(superdom_boarditems, board[i][j].colour?ICON_WIDTH:0, ICON_HEIGHT*3, #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, #else - STRIDE, MARGIN+(BOX_WIDTH*(i-1))+1, + ICON_STRIDE, MARGIN+(BOX_WIDTH*(i-1))+1, MARGIN+(BOX_HEIGHT*(j-1))+1+ICON_HEIGHT, #endif ICON_WIDTH, ICON_HEIGHT); @@ -341,10 +341,10 @@ void draw_board(void) { MY_BITMAP_PART(superdom_boarditems, board[i][j].colour?ICON_WIDTH:0, ICON_HEIGHT*4, #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, #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, #endif ICON_WIDTH, ICON_HEIGHT); @@ -353,10 +353,10 @@ void draw_board(void) { MY_BITMAP_PART(superdom_boarditems, board[i][j].colour?ICON_WIDTH:0, ICON_HEIGHT*5, #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, #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, #endif ICON_WIDTH, ICON_HEIGHT); |