JianWei Lee
/
project_game
Meteor defense project
Diff: main.cpp
- Revision:
- 41:1b396334256b
- Parent:
- 40:3a0c66a0e10e
- Child:
- 42:152e84494ad9
diff -r 3a0c66a0e10e -r 1b396334256b main.cpp --- a/main.cpp Sat Apr 29 19:27:20 2017 +0000 +++ b/main.cpp Sun Apr 30 21:53:28 2017 +0000 @@ -73,9 +73,12 @@ render(); wait(2.0); game.init(waveNumber); - game.update_RetryToMain(); //bring back the previous game state + game.update_MainToRetry(); //save the game state at the start of each wave waveCompleteTicker.attach(&waveComplete_isr,60); //60 seconds for a wave. setTicker = 0; //clear set ticker flag + if (pad.check_event(Gamepad::START_PRESSED)) { + //printf("start double click prevented"); + } } void gameUpgrades() { waveCompleteTicker.detach(); @@ -96,7 +99,8 @@ waveNumber += 1; } void gameMenu() { - + waveNumber = 0; + game.reset_Game(); while ( pad.check_event(Gamepad::START_PRESSED) == false) { game.startingMenu(pad, lcd); lcd.refresh();