thebears/marlin_skr
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Click-hold to exit Invaders, fix Brickout compile

Browse Source
This commit is contained in:
Scott Lahteine
2019-04-04 17:07:38 -05:00
parent 240ea1bbb3
commit 83e214478e
6 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Marlin/src/lcd/menu/game/brickout.cpp
View File

@@ -65,7 +65,7 @@ void reset_ball() {
}
void BrickoutGame::game_screen() {
if (game_frame()) do { // Run logic twice for finer resolution
if (game_frame()) { // Run logic twice for finer resolution
// Update Paddle Position
paddle_x = (int8_t)ui.encoderPosition;
paddle_x = constrain(paddle_x, 0, (LCD_PIXEL_WIDTH - (PADDLE_W)) / (PADDLE_VEL));
@@ -75,7 +75,7 @@ void BrickoutGame::game_screen() {
// Run the ball logic
if (game_state) do {
// Provisionally update the position
// Provisionally update the ball position
const fixed_t newx = ballx + ballh, newy = bally + ballv; // current next position
if (!WITHIN(newx, 0, BTOF(LCD_PIXEL_WIDTH - 1))) { // out in x?
ballh = -ballh; _BUZZ(5, 220); // bounce x
@@ -197,7 +197,7 @@ void BrickoutGame::game_screen() {
}
// A click always exits this game
if (ui.use_click()) ui.goto_previous_screen();
if (ui.use_click()) exit_game();
}
void BrickoutGame::enter_game() {