diff options
Diffstat (limited to 'apps/plugins/invadrox.c')
-rw-r--r-- | apps/plugins/invadrox.c | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/apps/plugins/invadrox.c b/apps/plugins/invadrox.c index 33ec343a87..1886ed4b49 100644 --- a/apps/plugins/invadrox.c +++ b/apps/plugins/invadrox.c | |||
@@ -684,7 +684,8 @@ void draw_number(int x, int y, int num, int digits) | |||
684 | d = num % 10; | 684 | d = num % 10; |
685 | num = num / 10; | 685 | num = num / 10; |
686 | rb->lcd_bitmap_part(invadrox_numbers, d * NUMBERS_WIDTH, 0, | 686 | rb->lcd_bitmap_part(invadrox_numbers, d * NUMBERS_WIDTH, 0, |
687 | STRIDE( BMPWIDTH_invadrox_numbers, | 687 | STRIDE( SCREEN_MAIN, |
688 | BMPWIDTH_invadrox_numbers, | ||
688 | BMPHEIGHT_invadrox_numbers), | 689 | BMPHEIGHT_invadrox_numbers), |
689 | x + i * (NUMBERS_WIDTH + NUM_SPACING), y, | 690 | x + i * (NUMBERS_WIDTH + NUM_SPACING), y, |
690 | NUMBERS_WIDTH, FONT_HEIGHT); | 691 | NUMBERS_WIDTH, FONT_HEIGHT); |
@@ -715,7 +716,8 @@ void draw_lives(void) | |||
715 | int i; | 716 | int i; |
716 | /* Lives num */ | 717 | /* Lives num */ |
717 | rb->lcd_bitmap_part(invadrox_numbers, lives * NUMBERS_WIDTH, 0, | 718 | rb->lcd_bitmap_part(invadrox_numbers, lives * NUMBERS_WIDTH, 0, |
718 | STRIDE( BMPWIDTH_invadrox_numbers, | 719 | STRIDE( SCREEN_MAIN, |
720 | BMPWIDTH_invadrox_numbers, | ||
719 | BMPHEIGHT_invadrox_numbers), | 721 | BMPHEIGHT_invadrox_numbers), |
720 | PLAYFIELD_X + LIVES_X, PLAYFIELD_Y + 2, | 722 | PLAYFIELD_X + LIVES_X, PLAYFIELD_Y + 2, |
721 | NUMBERS_WIDTH, FONT_HEIGHT); | 723 | NUMBERS_WIDTH, FONT_HEIGHT); |
@@ -723,7 +725,8 @@ void draw_lives(void) | |||
723 | /* Ships */ | 725 | /* Ships */ |
724 | for (i = 0; i < (lives - 1); i++) { | 726 | for (i = 0; i < (lives - 1); i++) { |
725 | rb->lcd_bitmap_part(invadrox_ships, 0, 0, | 727 | rb->lcd_bitmap_part(invadrox_ships, 0, 0, |
726 | STRIDE( BMPWIDTH_invadrox_ships, | 728 | STRIDE( SCREEN_MAIN, |
729 | BMPWIDTH_invadrox_ships, | ||
727 | BMPHEIGHT_invadrox_ships), | 730 | BMPHEIGHT_invadrox_ships), |
728 | PLAYFIELD_X + LIVES_X + SHIP_WIDTH + i * (SHIP_WIDTH + NUM_SPACING), | 731 | PLAYFIELD_X + LIVES_X + SHIP_WIDTH + i * (SHIP_WIDTH + NUM_SPACING), |
729 | PLAYFIELD_Y + 1, SHIP_WIDTH, SHIP_HEIGHT); | 732 | PLAYFIELD_Y + 1, SHIP_WIDTH, SHIP_HEIGHT); |
@@ -747,7 +750,8 @@ inline void draw_aliens(void) | |||
747 | for (i = 0; i < 5 * ALIENS; i++) { | 750 | for (i = 0; i < 5 * ALIENS; i++) { |
748 | rb->lcd_bitmap_part(invadrox_aliens, aliens[i].x & 1 ? ALIEN_WIDTH : 0, | 751 | rb->lcd_bitmap_part(invadrox_aliens, aliens[i].x & 1 ? ALIEN_WIDTH : 0, |
749 | aliens[i].type * ALIEN_HEIGHT, | 752 | aliens[i].type * ALIEN_HEIGHT, |
750 | STRIDE( BMPWIDTH_invadrox_aliens, | 753 | STRIDE( SCREEN_MAIN, |
754 | BMPWIDTH_invadrox_aliens, | ||
751 | BMPHEIGHT_invadrox_aliens), | 755 | BMPHEIGHT_invadrox_aliens), |
752 | PLAYFIELD_X + LIVES_X + aliens[i].x * ALIEN_SPEED, | 756 | PLAYFIELD_X + LIVES_X + aliens[i].x * ALIEN_SPEED, |
753 | ALIEN_START_Y + aliens[i].y * ALIEN_HEIGHT, | 757 | ALIEN_START_Y + aliens[i].y * ALIEN_HEIGHT, |
@@ -888,7 +892,8 @@ bool move_aliens(void) | |||
888 | rb->lcd_bitmap_part(invadrox_aliens, | 892 | rb->lcd_bitmap_part(invadrox_aliens, |
889 | aliens[curr_alien].x & 1 ? ALIEN_WIDTH : 0, | 893 | aliens[curr_alien].x & 1 ? ALIEN_WIDTH : 0, |
890 | aliens[curr_alien].type * ALIEN_HEIGHT, | 894 | aliens[curr_alien].type * ALIEN_HEIGHT, |
891 | STRIDE( BMPWIDTH_invadrox_aliens, | 895 | STRIDE( SCREEN_MAIN, |
896 | BMPWIDTH_invadrox_aliens, | ||
892 | BMPHEIGHT_invadrox_aliens), | 897 | BMPHEIGHT_invadrox_aliens), |
893 | x, y, ALIEN_WIDTH, ALIEN_HEIGHT); | 898 | x, y, ALIEN_WIDTH, ALIEN_HEIGHT); |
894 | 899 | ||
@@ -918,7 +923,8 @@ inline void draw_ship(void) | |||
918 | 923 | ||
919 | /* Draw ship */ | 924 | /* Draw ship */ |
920 | rb->lcd_bitmap_part(invadrox_ships, 0, ship_frame * SHIP_HEIGHT, | 925 | rb->lcd_bitmap_part(invadrox_ships, 0, ship_frame * SHIP_HEIGHT, |
921 | STRIDE( BMPWIDTH_invadrox_ships, | 926 | STRIDE( SCREEN_MAIN, |
927 | BMPWIDTH_invadrox_ships, | ||
922 | BMPHEIGHT_invadrox_ships), | 928 | BMPHEIGHT_invadrox_ships), |
923 | ship_x, SHIP_Y, SHIP_WIDTH, SHIP_HEIGHT); | 929 | ship_x, SHIP_Y, SHIP_WIDTH, SHIP_HEIGHT); |
924 | if (ship_hit) { | 930 | if (ship_hit) { |
@@ -1160,7 +1166,8 @@ inline void draw_bomb(int i) | |||
1160 | { | 1166 | { |
1161 | rb->lcd_bitmap_part(invadrox_bombs, bombs[i].type * BOMB_WIDTH, | 1167 | rb->lcd_bitmap_part(invadrox_bombs, bombs[i].type * BOMB_WIDTH, |
1162 | bombs[i].frame * BOMB_HEIGHT, | 1168 | bombs[i].frame * BOMB_HEIGHT, |
1163 | STRIDE( BMPWIDTH_invadrox_bombs, | 1169 | STRIDE( SCREEN_MAIN, |
1170 | BMPWIDTH_invadrox_bombs, | ||
1164 | BMPHEIGHT_invadrox_bombs), | 1171 | BMPHEIGHT_invadrox_bombs), |
1165 | bombs[i].x, bombs[i].y, | 1172 | bombs[i].x, bombs[i].y, |
1166 | BOMB_WIDTH, BOMB_HEIGHT); | 1173 | BOMB_WIDTH, BOMB_HEIGHT); |
@@ -1262,7 +1269,8 @@ void move_bombs(void) | |||
1262 | bombs[i].state = S_EXPLODE * 4; | 1269 | bombs[i].state = S_EXPLODE * 4; |
1263 | bombs[i].target = TARGET_SHIP; | 1270 | bombs[i].target = TARGET_SHIP; |
1264 | rb->lcd_bitmap_part(invadrox_ships, 0, 1 * SHIP_HEIGHT, | 1271 | rb->lcd_bitmap_part(invadrox_ships, 0, 1 * SHIP_HEIGHT, |
1265 | STRIDE( BMPWIDTH_invadrox_ships, | 1272 | STRIDE( SCREEN_MAIN, |
1273 | BMPWIDTH_invadrox_ships, | ||
1266 | BMPHEIGHT_invadrox_ships), | 1274 | BMPHEIGHT_invadrox_ships), |
1267 | ship_x, SHIP_Y, | 1275 | ship_x, SHIP_Y, |
1268 | SHIP_WIDTH, SHIP_HEIGHT); | 1276 | SHIP_WIDTH, SHIP_HEIGHT); |