diff options
-rw-r--r-- | apps/plugins/jewels.c | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/apps/plugins/jewels.c b/apps/plugins/jewels.c index 8f799e973f..b133aa1e45 100644 --- a/apps/plugins/jewels.c +++ b/apps/plugins/jewels.c | |||
@@ -511,12 +511,14 @@ static void jewels_drawboard(struct game_context* bj) { | |||
511 | TILE_WIDTH, TILE_HEIGHT); | 511 | TILE_WIDTH, TILE_HEIGHT); |
512 | rb->lcd_bitmap_transparent_part(jewels, | 512 | rb->lcd_bitmap_transparent_part(jewels, |
513 | 0, TILE_HEIGHT*(bj->playboard[i+1][j].type), | 513 | 0, TILE_HEIGHT*(bj->playboard[i+1][j].type), |
514 | TILE_WIDTH, j*TILE_WIDTH, i*TILE_HEIGHT+YOFS, | 514 | STRIDE(BMPWIDTH_jewels, BMPHEIGHT_jewels), |
515 | j*TILE_WIDTH, i*TILE_HEIGHT+YOFS, | ||
515 | TILE_WIDTH, TILE_HEIGHT); | 516 | TILE_WIDTH, TILE_HEIGHT); |
516 | #else | 517 | #else |
517 | rb->lcd_bitmap_part(jewels, | 518 | rb->lcd_bitmap_part(jewels, |
518 | 0, TILE_HEIGHT*(bj->playboard[i+1][j].type), | 519 | 0, TILE_HEIGHT*(bj->playboard[i+1][j].type), |
519 | TILE_WIDTH, j*TILE_WIDTH, i*TILE_HEIGHT+YOFS, | 520 | STRIDE(BMPWIDTH_jewels, BMPHEIGHT_jewels), |
521 | j*TILE_WIDTH, i*TILE_HEIGHT+YOFS, | ||
520 | TILE_WIDTH, TILE_HEIGHT); | 522 | TILE_WIDTH, TILE_HEIGHT); |
521 | #endif | 523 | #endif |
522 | } | 524 | } |
@@ -727,14 +729,16 @@ static void jewels_putjewels(struct game_context* bj){ | |||
727 | #ifdef HAVE_LCD_COLOR | 729 | #ifdef HAVE_LCD_COLOR |
728 | rb->lcd_bitmap_transparent_part(jewels, 0, | 730 | rb->lcd_bitmap_transparent_part(jewels, 0, |
729 | TILE_HEIGHT*(bj->playboard[i][j].type), | 731 | TILE_HEIGHT*(bj->playboard[i][j].type), |
730 | TILE_WIDTH, j*TILE_WIDTH, | 732 | STRIDE(BMPWIDTH_jewels, BMPHEIGHT_jewels), |
733 | j*TILE_WIDTH, | ||
731 | (i-1)*TILE_HEIGHT+YOFS+ | 734 | (i-1)*TILE_HEIGHT+YOFS+ |
732 | ((((TILE_HEIGHT<<10)*k)/8)>>10), | 735 | ((((TILE_HEIGHT<<10)*k)/8)>>10), |
733 | TILE_WIDTH, TILE_HEIGHT); | 736 | TILE_WIDTH, TILE_HEIGHT); |
734 | #else | 737 | #else |
735 | rb->lcd_bitmap_part(jewels, 0, | 738 | rb->lcd_bitmap_part(jewels, 0, |
736 | TILE_HEIGHT*(bj->playboard[i][j].type), | 739 | TILE_HEIGHT*(bj->playboard[i][j].type), |
737 | TILE_WIDTH, j*TILE_WIDTH, | 740 | STRIDE(BMPWIDTH_jewels, BMPHEIGHT_jewels), |
741 | j*TILE_WIDTH, | ||
738 | (i-1)*TILE_HEIGHT+YOFS+ | 742 | (i-1)*TILE_HEIGHT+YOFS+ |
739 | ((((TILE_HEIGHT<<10)*k)/8)>>10), | 743 | ((((TILE_HEIGHT<<10)*k)/8)>>10), |
740 | TILE_WIDTH, TILE_HEIGHT); | 744 | TILE_WIDTH, TILE_HEIGHT); |
@@ -952,7 +956,8 @@ static unsigned int jewels_swapjewels(struct game_context* bj, | |||
952 | #ifdef HAVE_LCD_COLOR | 956 | #ifdef HAVE_LCD_COLOR |
953 | rb->lcd_bitmap_transparent_part(jewels, | 957 | rb->lcd_bitmap_transparent_part(jewels, |
954 | 0, TILE_HEIGHT*(bj->playboard | 958 | 0, TILE_HEIGHT*(bj->playboard |
955 | [y+1+vertmod][x+horzmod].type), TILE_WIDTH, | 959 | [y+1+vertmod][x+horzmod].type), |
960 | STRIDE(BMPWIDTH_jewels, BMPHEIGHT_jewels), | ||
956 | (x+horzmod)*TILE_WIDTH-horzmod* | 961 | (x+horzmod)*TILE_WIDTH-horzmod* |
957 | ((((movelen<<10)*k)/8)>>10), | 962 | ((((movelen<<10)*k)/8)>>10), |
958 | (y+vertmod)*TILE_HEIGHT-vertmod* | 963 | (y+vertmod)*TILE_HEIGHT-vertmod* |
@@ -960,7 +965,8 @@ static unsigned int jewels_swapjewels(struct game_context* bj, | |||
960 | TILE_WIDTH, TILE_HEIGHT); | 965 | TILE_WIDTH, TILE_HEIGHT); |
961 | rb->lcd_bitmap_transparent_part(jewels, | 966 | rb->lcd_bitmap_transparent_part(jewels, |
962 | 0, TILE_HEIGHT*(bj->playboard[y+1][x].type), | 967 | 0, TILE_HEIGHT*(bj->playboard[y+1][x].type), |
963 | TILE_WIDTH, x*TILE_WIDTH+horzmod* | 968 | STRIDE(BMPWIDTH_jewels, BMPHEIGHT_jewels), |
969 | x*TILE_WIDTH+horzmod* | ||
964 | ((((movelen<<10)*k)/8)>>10), | 970 | ((((movelen<<10)*k)/8)>>10), |
965 | y*TILE_HEIGHT+vertmod* | 971 | y*TILE_HEIGHT+vertmod* |
966 | ((((movelen<<10)*k)/8)>>10)+YOFS, | 972 | ((((movelen<<10)*k)/8)>>10)+YOFS, |
@@ -968,7 +974,8 @@ static unsigned int jewels_swapjewels(struct game_context* bj, | |||
968 | #else | 974 | #else |
969 | rb->lcd_bitmap_part(jewels, | 975 | rb->lcd_bitmap_part(jewels, |
970 | 0, TILE_HEIGHT*(bj->playboard | 976 | 0, TILE_HEIGHT*(bj->playboard |
971 | [y+1+vertmod][x+horzmod].type), TILE_WIDTH, | 977 | [y+1+vertmod][x+horzmod].type), |
978 | STRIDE(BMPWIDTH_jewels, BMPHEIGHT_jewels), | ||
972 | (x+horzmod)*TILE_WIDTH-horzmod* | 979 | (x+horzmod)*TILE_WIDTH-horzmod* |
973 | ((((movelen<<10)*k)/8)>>10), | 980 | ((((movelen<<10)*k)/8)>>10), |
974 | (y+vertmod)*TILE_HEIGHT-vertmod* | 981 | (y+vertmod)*TILE_HEIGHT-vertmod* |
@@ -977,7 +984,8 @@ static unsigned int jewels_swapjewels(struct game_context* bj, | |||
977 | rb->lcd_set_drawmode(DRMODE_FG); | 984 | rb->lcd_set_drawmode(DRMODE_FG); |
978 | rb->lcd_bitmap_part(jewels, | 985 | rb->lcd_bitmap_part(jewels, |
979 | 0, TILE_HEIGHT*(bj->playboard[y+1][x].type), | 986 | 0, TILE_HEIGHT*(bj->playboard[y+1][x].type), |
980 | TILE_WIDTH, x*TILE_WIDTH+horzmod* | 987 | STRIDE(BMPWIDTH_jewels, BMPHEIGHT_jewels), |
988 | x*TILE_WIDTH+horzmod* | ||
981 | ((((movelen<<10)*k)/8)>>10), | 989 | ((((movelen<<10)*k)/8)>>10), |
982 | y*TILE_HEIGHT+vertmod* | 990 | y*TILE_HEIGHT+vertmod* |
983 | ((((movelen<<10)*k)/8)>>10)+YOFS, | 991 | ((((movelen<<10)*k)/8)>>10)+YOFS, |