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 | |
parent | 7bb7c5f0cc7bf5b5172aeb4d75ef886b19755863 (diff) | |
download | rockbox-eb3cb724e8d4b60f20356944173e7cddddb51398.tar.gz rockbox-eb3cb724e8d4b60f20356944173e7cddddb51398.zip |
Correct superdom conflict
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22547 a1c6a512-1295-4272-9138-f99709370657
-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 dc078170e9..d9c857d0c0 100644 --- a/apps/plugins/superdom.c +++ b/apps/plugins/superdom.c | |||
@@ -62,7 +62,7 @@ char buf[255]; | |||
62 | /* These parameters define the piece image dimensions, Stride is the total width | 62 | /* These parameters define the piece image dimensions, Stride is the total width |
63 | * of the bitmap. | 63 | * of the bitmap. |
64 | */ | 64 | */ |
65 | #define STRIDE BMPWIDTH_superdom_boarditems | 65 | #define ICON_STRIDE BMPWIDTH_superdom_boarditems |
66 | #define ICON_HEIGHT (BMPHEIGHT_superdom_boarditems/6) | 66 | #define ICON_HEIGHT (BMPHEIGHT_superdom_boarditems/6) |
67 | #define ICON_WIDTH (BMPWIDTH_superdom_boarditems/2) | 67 | #define ICON_WIDTH (BMPWIDTH_superdom_boarditems/2) |
68 | 68 | ||
@@ -301,7 +301,7 @@ void draw_board(void) { | |||
301 | #endif | 301 | #endif |
302 | if(board[i][j].ind) { | 302 | if(board[i][j].ind) { |
303 | MY_BITMAP_PART(superdom_boarditems, | 303 | MY_BITMAP_PART(superdom_boarditems, |
304 | board[i][j].colour?ICON_WIDTH:0, 0, STRIDE, | 304 | board[i][j].colour?ICON_WIDTH:0, 0, ICON_STRIDE, |
305 | #if LCD_WIDTH > LCD_HEIGHT | 305 | #if LCD_WIDTH > LCD_HEIGHT |
306 | MARGIN+(BOX_WIDTH*(i-1))+1, | 306 | MARGIN+(BOX_WIDTH*(i-1))+1, |
307 | MARGIN+(BOX_HEIGHT*(j-1))+ICON_HEIGHT+1, | 307 | MARGIN+(BOX_HEIGHT*(j-1))+ICON_HEIGHT+1, |
@@ -314,14 +314,14 @@ void draw_board(void) { | |||
314 | if(board[i][j].farm) { | 314 | if(board[i][j].farm) { |
315 | MY_BITMAP_PART(superdom_boarditems, | 315 | MY_BITMAP_PART(superdom_boarditems, |
316 | board[i][j].colour?ICON_WIDTH:0, ICON_HEIGHT, | 316 | board[i][j].colour?ICON_WIDTH:0, ICON_HEIGHT, |
317 | STRIDE, MARGIN+(BOX_WIDTH*(i-1))+1, | 317 | ICON_STRIDE, MARGIN+(BOX_WIDTH*(i-1))+1, |
318 | MARGIN+(BOX_HEIGHT*(j-1))+1, | 318 | MARGIN+(BOX_HEIGHT*(j-1))+1, |
319 | ICON_WIDTH, ICON_HEIGHT); | 319 | ICON_WIDTH, ICON_HEIGHT); |
320 | } | 320 | } |
321 | if(board[i][j].tank) { | 321 | if(board[i][j].tank) { |
322 | MY_BITMAP_PART(superdom_boarditems, | 322 | MY_BITMAP_PART(superdom_boarditems, |
323 | board[i][j].colour?ICON_WIDTH:0, ICON_HEIGHT*2, | 323 | board[i][j].colour?ICON_WIDTH:0, ICON_HEIGHT*2, |
324 | STRIDE, MARGIN+(BOX_WIDTH*(i-1))+ICON_WIDTH+1, | 324 | ICON_STRIDE, MARGIN+(BOX_WIDTH*(i-1))+ICON_WIDTH+1, |
325 | MARGIN+(BOX_HEIGHT*(j-1))+ICON_HEIGHT+1, | 325 | MARGIN+(BOX_HEIGHT*(j-1))+ICON_HEIGHT+1, |
326 | ICON_WIDTH, ICON_HEIGHT); | 326 | ICON_WIDTH, ICON_HEIGHT); |
327 | } | 327 | } |
@@ -329,10 +329,10 @@ void draw_board(void) { | |||
329 | MY_BITMAP_PART(superdom_boarditems, | 329 | MY_BITMAP_PART(superdom_boarditems, |
330 | board[i][j].colour?ICON_WIDTH:0, ICON_HEIGHT*3, | 330 | board[i][j].colour?ICON_WIDTH:0, ICON_HEIGHT*3, |
331 | #if LCD_WIDTH > LCD_HEIGHT | 331 | #if LCD_WIDTH > LCD_HEIGHT |
332 | STRIDE, MARGIN+(BOX_WIDTH*(i-1))+ICON_WIDTH+1, | 332 | ICON_STRIDE, MARGIN+(BOX_WIDTH*(i-1))+ICON_WIDTH+1, |
333 | MARGIN+(BOX_HEIGHT*(j-1))+1, | 333 | MARGIN+(BOX_HEIGHT*(j-1))+1, |
334 | #else | 334 | #else |
335 | STRIDE, MARGIN+(BOX_WIDTH*(i-1))+1, | 335 | ICON_STRIDE, MARGIN+(BOX_WIDTH*(i-1))+1, |
336 | MARGIN+(BOX_HEIGHT*(j-1))+1+ICON_HEIGHT, | 336 | MARGIN+(BOX_HEIGHT*(j-1))+1+ICON_HEIGHT, |
337 | #endif | 337 | #endif |
338 | ICON_WIDTH, ICON_HEIGHT); | 338 | ICON_WIDTH, ICON_HEIGHT); |
@@ -341,10 +341,10 @@ void draw_board(void) { | |||
341 | MY_BITMAP_PART(superdom_boarditems, | 341 | MY_BITMAP_PART(superdom_boarditems, |
342 | board[i][j].colour?ICON_WIDTH:0, ICON_HEIGHT*4, | 342 | board[i][j].colour?ICON_WIDTH:0, ICON_HEIGHT*4, |
343 | #if LCD_WIDTH > LCD_HEIGHT | 343 | #if LCD_WIDTH > LCD_HEIGHT |
344 | STRIDE,MARGIN+(BOX_WIDTH*(i-1))+ICON_WIDTH*2+1, | 344 | ICON_STRIDE,MARGIN+(BOX_WIDTH*(i-1))+ICON_WIDTH*2+1, |
345 | MARGIN+(BOX_HEIGHT*(j-1))+ICON_HEIGHT+1, | 345 | MARGIN+(BOX_HEIGHT*(j-1))+ICON_HEIGHT+1, |
346 | #else | 346 | #else |
347 | STRIDE,MARGIN+(BOX_WIDTH*(i-1))+ICON_WIDTH+1, | 347 | ICON_STRIDE,MARGIN+(BOX_WIDTH*(i-1))+ICON_WIDTH+1, |
348 | MARGIN+(BOX_HEIGHT*(j-1))+ICON_HEIGHT*2+1, | 348 | MARGIN+(BOX_HEIGHT*(j-1))+ICON_HEIGHT*2+1, |
349 | #endif | 349 | #endif |
350 | ICON_WIDTH, ICON_HEIGHT); | 350 | ICON_WIDTH, ICON_HEIGHT); |
@@ -353,10 +353,10 @@ void draw_board(void) { | |||
353 | MY_BITMAP_PART(superdom_boarditems, | 353 | MY_BITMAP_PART(superdom_boarditems, |
354 | board[i][j].colour?ICON_WIDTH:0, ICON_HEIGHT*5, | 354 | board[i][j].colour?ICON_WIDTH:0, ICON_HEIGHT*5, |
355 | #if LCD_WIDTH > LCD_HEIGHT | 355 | #if LCD_WIDTH > LCD_HEIGHT |
356 | STRIDE,MARGIN+(BOX_WIDTH*(i-1))+ICON_WIDTH*2+1, | 356 | ICON_STRIDE,MARGIN+(BOX_WIDTH*(i-1))+ICON_WIDTH*2+1, |
357 | MARGIN+(BOX_HEIGHT*(j-1))+1, | 357 | MARGIN+(BOX_HEIGHT*(j-1))+1, |
358 | #else | 358 | #else |
359 | STRIDE,MARGIN+(BOX_WIDTH*(i-1))+1, | 359 | ICON_STRIDE,MARGIN+(BOX_WIDTH*(i-1))+1, |
360 | MARGIN+(BOX_HEIGHT*(j-1))+ICON_HEIGHT*2+1, | 360 | MARGIN+(BOX_HEIGHT*(j-1))+ICON_HEIGHT*2+1, |
361 | #endif | 361 | #endif |
362 | ICON_WIDTH, ICON_HEIGHT); | 362 | ICON_WIDTH, ICON_HEIGHT); |