bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Fix Invaders game compile error (#13575)

Browse Source
This commit is contained in:
drzejkopf
2019-04-05 06:13:11 +02:00
committed by Scott Lahteine
parent cd1ef33c8c
commit 0992d1a4c8
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Marlin/src/lcd/menu/game/invaders.cpp
View File

@@ -182,7 +182,7 @@ typedef struct { int8_t x, y, v; } laser_t;
uint8_t cannons_left; uint8_t cannons_left;
int8_t cannon_x; int8_t cannon_x;
laser_t laser, expl, bullet[10]; laser_t explod, laser, bullet[10];
constexpr uint8_t inv_off[] = { 2, 1, 0 }, inv_wide[] = { 8, 11, 12 }; constexpr uint8_t inv_off[] = { 2, 1, 0 }, inv_wide[] = { 8, 11, 12 };
int8_t invaders_x, invaders_y, invaders_dir, leftmost, rightmost, botmost; int8_t invaders_x, invaders_y, invaders_dir, leftmost, rightmost, botmost;
uint8_t invader_count, quit_count, bugs[INVADER_ROWS], shooters[(INVADER_ROWS) * (INVADER_COLS)]; uint8_t invader_count, quit_count, bugs[INVADER_ROWS], shooters[(INVADER_ROWS) * (INVADER_COLS)];
@@ -236,7 +236,9 @@ inline void fire_cannon() {
} }
inline void explode(const int8_t x, const int8_t y, const int8_t v=4) { inline void explode(const int8_t x, const int8_t y, const int8_t v=4) {
expl.x = x - (EXPL_W) / 2; expl.y = y; expl.v = v; explod.x = x - (EXPL_W) / 2;
explod.y = y;
explod.v = v;
} }
inline void kill_cannon(uint8_t &game_state, const uint8_t st) { inline void kill_cannon(uint8_t &game_state, const uint8_t st) {
@@ -431,9 +433,9 @@ void InvadersGame::game_screen() {
} }
// Draw explosion // Draw explosion
if (expl.v && PAGE_CONTAINS(expl.y, expl.y + 7 - 1)) { if (explod.v && PAGE_CONTAINS(explod.y, explod.y + 7 - 1)) {
u8g.drawBitmapP(expl.x, expl.y, 2, 7, explosion); u8g.drawBitmapP(explod.x, explod.y, 2, 7, explosion);
--expl.v; --explod.v;
} }
// Blink GAME OVER when game is over // Blink GAME OVER when game is over