diff options
author | Karl Kurbjun <kkurbjun@gmail.com> | 2009-09-04 00:46:24 +0000 |
---|---|---|
committer | Karl Kurbjun <kkurbjun@gmail.com> | 2009-09-04 00:46:24 +0000 |
commit | 25123570c76f2055d3ae05d79741038c0e23c536 (patch) | |
tree | a2edd8351a611b9cef0aef08c880a994d9e1d75e /apps/plugins/star.c | |
parent | f6025186fd1f6d9083c07568bc3d160f3e8774f8 (diff) | |
download | rockbox-25123570c76f2055d3ae05d79741038c0e23c536.tar.gz rockbox-25123570c76f2055d3ae05d79741038c0e23c536.zip |
Fix STRIDE macro for multiscreen and add stride support for picture lib.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22615 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins/star.c')
-rw-r--r-- | apps/plugins/star.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/apps/plugins/star.c b/apps/plugins/star.c index e40fa5a2dc..6079ba488e 100644 --- a/apps/plugins/star.c +++ b/apps/plugins/star.c | |||
@@ -729,7 +729,8 @@ static void star_display_board_info(int current_level) | |||
729 | 729 | ||
730 | rb->lcd_bitmap_part(star_tiles, 0, control == STAR_CONTROL_BALL ? | 730 | rb->lcd_bitmap_part(star_tiles, 0, control == STAR_CONTROL_BALL ? |
731 | BALL*TILE_HEIGHT : BLOCK*TILE_HEIGHT, | 731 | BALL*TILE_HEIGHT : BLOCK*TILE_HEIGHT, |
732 | STRIDE(BMPWIDTH_star_tiles, BMPHEIGHT_star_tiles), | 732 | STRIDE( SCREEN_MAIN, |
733 | BMPWIDTH_star_tiles, BMPHEIGHT_star_tiles), | ||
733 | STAR_OFFSET_X + (STAR_WIDTH-1) * TILE_WIDTH, | 734 | STAR_OFFSET_X + (STAR_WIDTH-1) * TILE_WIDTH, |
734 | tile_pos_y, TILE_WIDTH, TILE_HEIGHT); | 735 | tile_pos_y, TILE_WIDTH, TILE_HEIGHT); |
735 | 736 | ||
@@ -768,7 +769,8 @@ static int star_load_level(int current_level) | |||
768 | # define DRAW_TILE( a ) \ | 769 | # define DRAW_TILE( a ) \ |
769 | rb->lcd_bitmap_part( star_tiles, 0, \ | 770 | rb->lcd_bitmap_part( star_tiles, 0, \ |
770 | a*TILE_HEIGHT, \ | 771 | a*TILE_HEIGHT, \ |
771 | STRIDE( BMPWIDTH_star_tiles, \ | 772 | STRIDE( SCREEN_MAIN, \ |
773 | BMPWIDTH_star_tiles, \ | ||
772 | BMPHEIGHT_star_tiles), \ | 774 | BMPHEIGHT_star_tiles), \ |
773 | STAR_OFFSET_X + x * TILE_WIDTH, \ | 775 | STAR_OFFSET_X + x * TILE_WIDTH, \ |
774 | STAR_OFFSET_Y + y * TILE_HEIGHT, \ | 776 | STAR_OFFSET_Y + y * TILE_HEIGHT, \ |
@@ -820,10 +822,12 @@ static void star_animate_tile(int tile_no, int start_x, int start_y, | |||
820 | { | 822 | { |
821 | STAR_SLEEP | 823 | STAR_SLEEP |
822 | rb->lcd_bitmap_part(star_tiles, 0, SPACE * TILE_HEIGHT, | 824 | rb->lcd_bitmap_part(star_tiles, 0, SPACE * TILE_HEIGHT, |
823 | STRIDE(BMPWIDTH_star_tiles, BMPHEIGHT_star_tiles), | 825 | STRIDE( SCREEN_MAIN, |
826 | BMPWIDTH_star_tiles, BMPHEIGHT_star_tiles), | ||
824 | start_x, start_y, TILE_WIDTH, TILE_HEIGHT); | 827 | start_x, start_y, TILE_WIDTH, TILE_HEIGHT); |
825 | rb->lcd_bitmap_part(star_tiles, 0, tile_no * TILE_HEIGHT, | 828 | rb->lcd_bitmap_part(star_tiles, 0, tile_no * TILE_HEIGHT, |
826 | STRIDE(BMPWIDTH_star_tiles, BMPHEIGHT_star_tiles), | 829 | STRIDE( SCREEN_MAIN, |
830 | BMPWIDTH_star_tiles, BMPHEIGHT_star_tiles), | ||
827 | start_x + delta_x * i, start_y, TILE_WIDTH, TILE_HEIGHT); | 831 | start_x + delta_x * i, start_y, TILE_WIDTH, TILE_HEIGHT); |
828 | rb->lcd_update_rect(start_x + delta_x * i - (delta_x>0?1:0), | 832 | rb->lcd_update_rect(start_x + delta_x * i - (delta_x>0?1:0), |
829 | start_y, TILE_WIDTH + 1, TILE_HEIGHT); | 833 | start_y, TILE_WIDTH + 1, TILE_HEIGHT); |
@@ -835,10 +839,12 @@ static void star_animate_tile(int tile_no, int start_x, int start_y, | |||
835 | { | 839 | { |
836 | STAR_SLEEP | 840 | STAR_SLEEP |
837 | rb->lcd_bitmap_part(star_tiles, 0, SPACE * TILE_HEIGHT, | 841 | rb->lcd_bitmap_part(star_tiles, 0, SPACE * TILE_HEIGHT, |
838 | STRIDE(BMPWIDTH_star_tiles, BMPHEIGHT_star_tiles), | 842 | STRIDE( SCREEN_MAIN, |
843 | BMPWIDTH_star_tiles, BMPHEIGHT_star_tiles), | ||
839 | start_x, start_y, TILE_WIDTH, TILE_HEIGHT); | 844 | start_x, start_y, TILE_WIDTH, TILE_HEIGHT); |
840 | rb->lcd_bitmap_part(star_tiles, 0, tile_no * TILE_HEIGHT, | 845 | rb->lcd_bitmap_part(star_tiles, 0, tile_no * TILE_HEIGHT, |
841 | STRIDE(BMPWIDTH_star_tiles, BMPHEIGHT_star_tiles), | 846 | STRIDE( SCREEN_MAIN, |
847 | BMPWIDTH_star_tiles, BMPHEIGHT_star_tiles), | ||
842 | start_x, start_y + delta_y * i, TILE_WIDTH, TILE_HEIGHT); | 848 | start_x, start_y + delta_y * i, TILE_WIDTH, TILE_HEIGHT); |
843 | rb->lcd_update_rect(start_x, start_y + delta_y * i - (delta_y>0?1:0), | 849 | rb->lcd_update_rect(start_x, start_y + delta_y * i - (delta_y>0?1:0), |
844 | TILE_WIDTH, TILE_HEIGHT + 1); | 850 | TILE_WIDTH, TILE_HEIGHT + 1); |