diff options
Diffstat (limited to 'apps/plugins/jewels.c')
-rw-r--r-- | apps/plugins/jewels.c | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/apps/plugins/jewels.c b/apps/plugins/jewels.c index 01c5e1ea0b..f049fdca5c 100644 --- a/apps/plugins/jewels.c +++ b/apps/plugins/jewels.c | |||
@@ -512,13 +512,15 @@ static void jewels_drawboard(struct game_context* bj) { | |||
512 | TILE_WIDTH, TILE_HEIGHT); | 512 | TILE_WIDTH, TILE_HEIGHT); |
513 | rb->lcd_bitmap_transparent_part(jewels, | 513 | rb->lcd_bitmap_transparent_part(jewels, |
514 | 0, TILE_HEIGHT*(bj->playboard[i+1][j].type), | 514 | 0, TILE_HEIGHT*(bj->playboard[i+1][j].type), |
515 | STRIDE(BMPWIDTH_jewels, BMPHEIGHT_jewels), | 515 | STRIDE( SCREEN_MAIN, |
516 | BMPWIDTH_jewels, BMPHEIGHT_jewels), | ||
516 | j*TILE_WIDTH, i*TILE_HEIGHT+YOFS, | 517 | j*TILE_WIDTH, i*TILE_HEIGHT+YOFS, |
517 | TILE_WIDTH, TILE_HEIGHT); | 518 | TILE_WIDTH, TILE_HEIGHT); |
518 | #else | 519 | #else |
519 | rb->lcd_bitmap_part(jewels, | 520 | rb->lcd_bitmap_part(jewels, |
520 | 0, TILE_HEIGHT*(bj->playboard[i+1][j].type), | 521 | 0, TILE_HEIGHT*(bj->playboard[i+1][j].type), |
521 | STRIDE(BMPWIDTH_jewels, BMPHEIGHT_jewels), | 522 | STRIDE( SCREEN_MAIN, |
523 | BMPWIDTH_jewels, BMPHEIGHT_jewels), | ||
522 | j*TILE_WIDTH, i*TILE_HEIGHT+YOFS, | 524 | j*TILE_WIDTH, i*TILE_HEIGHT+YOFS, |
523 | TILE_WIDTH, TILE_HEIGHT); | 525 | TILE_WIDTH, TILE_HEIGHT); |
524 | #endif | 526 | #endif |
@@ -730,7 +732,9 @@ static void jewels_putjewels(struct game_context* bj){ | |||
730 | #ifdef HAVE_LCD_COLOR | 732 | #ifdef HAVE_LCD_COLOR |
731 | rb->lcd_bitmap_transparent_part(jewels, 0, | 733 | rb->lcd_bitmap_transparent_part(jewels, 0, |
732 | TILE_HEIGHT*(bj->playboard[i][j].type), | 734 | TILE_HEIGHT*(bj->playboard[i][j].type), |
733 | STRIDE(BMPWIDTH_jewels, BMPHEIGHT_jewels), | 735 | STRIDE( SCREEN_MAIN, |
736 | BMPWIDTH_jewels, | ||
737 | BMPHEIGHT_jewels), | ||
734 | j*TILE_WIDTH, | 738 | j*TILE_WIDTH, |
735 | (i-1)*TILE_HEIGHT+YOFS+ | 739 | (i-1)*TILE_HEIGHT+YOFS+ |
736 | ((((TILE_HEIGHT<<10)*k)/8)>>10), | 740 | ((((TILE_HEIGHT<<10)*k)/8)>>10), |
@@ -738,7 +742,9 @@ static void jewels_putjewels(struct game_context* bj){ | |||
738 | #else | 742 | #else |
739 | rb->lcd_bitmap_part(jewels, 0, | 743 | rb->lcd_bitmap_part(jewels, 0, |
740 | TILE_HEIGHT*(bj->playboard[i][j].type), | 744 | TILE_HEIGHT*(bj->playboard[i][j].type), |
741 | STRIDE(BMPWIDTH_jewels, BMPHEIGHT_jewels), | 745 | STRIDE( SCREEN_MAIN, |
746 | BMPWIDTH_jewels, | ||
747 | BMPHEIGHT_jewels), | ||
742 | j*TILE_WIDTH, | 748 | j*TILE_WIDTH, |
743 | (i-1)*TILE_HEIGHT+YOFS+ | 749 | (i-1)*TILE_HEIGHT+YOFS+ |
744 | ((((TILE_HEIGHT<<10)*k)/8)>>10), | 750 | ((((TILE_HEIGHT<<10)*k)/8)>>10), |
@@ -958,7 +964,8 @@ static unsigned int jewels_swapjewels(struct game_context* bj, | |||
958 | rb->lcd_bitmap_transparent_part(jewels, | 964 | rb->lcd_bitmap_transparent_part(jewels, |
959 | 0, TILE_HEIGHT*(bj->playboard | 965 | 0, TILE_HEIGHT*(bj->playboard |
960 | [y+1+vertmod][x+horzmod].type), | 966 | [y+1+vertmod][x+horzmod].type), |
961 | STRIDE(BMPWIDTH_jewels, BMPHEIGHT_jewels), | 967 | STRIDE( SCREEN_MAIN, |
968 | BMPWIDTH_jewels, BMPHEIGHT_jewels), | ||
962 | (x+horzmod)*TILE_WIDTH-horzmod* | 969 | (x+horzmod)*TILE_WIDTH-horzmod* |
963 | ((((movelen<<10)*k)/8)>>10), | 970 | ((((movelen<<10)*k)/8)>>10), |
964 | (y+vertmod)*TILE_HEIGHT-vertmod* | 971 | (y+vertmod)*TILE_HEIGHT-vertmod* |
@@ -966,7 +973,8 @@ static unsigned int jewels_swapjewels(struct game_context* bj, | |||
966 | TILE_WIDTH, TILE_HEIGHT); | 973 | TILE_WIDTH, TILE_HEIGHT); |
967 | rb->lcd_bitmap_transparent_part(jewels, | 974 | rb->lcd_bitmap_transparent_part(jewels, |
968 | 0, TILE_HEIGHT*(bj->playboard[y+1][x].type), | 975 | 0, TILE_HEIGHT*(bj->playboard[y+1][x].type), |
969 | STRIDE(BMPWIDTH_jewels, BMPHEIGHT_jewels), | 976 | STRIDE( SCREEN_MAIN, |
977 | BMPWIDTH_jewels, BMPHEIGHT_jewels), | ||
970 | x*TILE_WIDTH+horzmod* | 978 | x*TILE_WIDTH+horzmod* |
971 | ((((movelen<<10)*k)/8)>>10), | 979 | ((((movelen<<10)*k)/8)>>10), |
972 | y*TILE_HEIGHT+vertmod* | 980 | y*TILE_HEIGHT+vertmod* |
@@ -976,7 +984,8 @@ static unsigned int jewels_swapjewels(struct game_context* bj, | |||
976 | rb->lcd_bitmap_part(jewels, | 984 | rb->lcd_bitmap_part(jewels, |
977 | 0, TILE_HEIGHT*(bj->playboard | 985 | 0, TILE_HEIGHT*(bj->playboard |
978 | [y+1+vertmod][x+horzmod].type), | 986 | [y+1+vertmod][x+horzmod].type), |
979 | STRIDE(BMPWIDTH_jewels, BMPHEIGHT_jewels), | 987 | STRIDE( SCREEN_MAIN, |
988 | BMPWIDTH_jewels, BMPHEIGHT_jewels), | ||
980 | (x+horzmod)*TILE_WIDTH-horzmod* | 989 | (x+horzmod)*TILE_WIDTH-horzmod* |
981 | ((((movelen<<10)*k)/8)>>10), | 990 | ((((movelen<<10)*k)/8)>>10), |
982 | (y+vertmod)*TILE_HEIGHT-vertmod* | 991 | (y+vertmod)*TILE_HEIGHT-vertmod* |
@@ -985,7 +994,8 @@ static unsigned int jewels_swapjewels(struct game_context* bj, | |||
985 | rb->lcd_set_drawmode(DRMODE_FG); | 994 | rb->lcd_set_drawmode(DRMODE_FG); |
986 | rb->lcd_bitmap_part(jewels, | 995 | rb->lcd_bitmap_part(jewels, |
987 | 0, TILE_HEIGHT*(bj->playboard[y+1][x].type), | 996 | 0, TILE_HEIGHT*(bj->playboard[y+1][x].type), |
988 | STRIDE(BMPWIDTH_jewels, BMPHEIGHT_jewels), | 997 | STRIDE( SCREEN_MAIN, |
998 | BMPWIDTH_jewels, BMPHEIGHT_jewels), | ||
989 | x*TILE_WIDTH+horzmod* | 999 | x*TILE_WIDTH+horzmod* |
990 | ((((movelen<<10)*k)/8)>>10), | 1000 | ((((movelen<<10)*k)/8)>>10), |
991 | y*TILE_HEIGHT+vertmod* | 1001 | y*TILE_HEIGHT+vertmod* |