
Zeyu Feng 201377605
Dependencies: mbed
On Minerva
Diff: main.cpp
- Revision:
- 14:42b8a91e463c
- Parent:
- 13:eb60628db8bf
- Child:
- 15:3571beaaeed8
--- a/main.cpp Thu May 14 16:45:20 2020 +0000 +++ b/main.cpp Fri May 15 08:04:39 2020 +0000 @@ -80,6 +80,7 @@ void main_game(float increment,int max){ + pad.reset_buttons(); ticker.attach(&flip,2);//set a ticker timeout.attach(&time_out,3);//set a timeout @@ -132,6 +133,7 @@ collision.set_pos(engine.get_pos()); // if people is shotted, health -1 and reset the game if(collision.check(lcd)) { + pad.play_melody(2,sound_data_col,sound_dur_col,120,0); if(!collision.get_health()){ interface.game_over(lcd,pad); } else{