JianWei Lee
/
project_game
Meteor defense project
Diff: main.cpp
- Revision:
- 5:c74bbdda06f4
- Parent:
- 4:4145abd09075
- Child:
- 7:3be4369131c6
diff -r 4145abd09075 -r c74bbdda06f4 main.cpp --- a/main.cpp Wed Mar 22 15:19:20 2017 +0000 +++ b/main.cpp Wed Mar 22 17:15:38 2017 +0000 @@ -1,8 +1,6 @@ #include "mbed.h" #include "N5110.h" #include "Gamepad.h" -#include "Weapon.h" -#include "Spawn.h" #include "GameEngine.h" #define PI 3.14159265 @@ -13,7 +11,7 @@ N5110 lcd(PTC9,PTC0,PTC7,PTD2,PTD1,PTC11); Gamepad pad; GameEngine game; -Weapon weap; + int gamefps = 15; @@ -27,12 +25,7 @@ while (true) { game.drawSpawn(lcd); - weap.drawWeapon(pad, lcd); - - if (pad.buttonhold == 1) { - printf("hi im working \n"); - weap.fireWeapon(pad, lcd); - } + game.drawLaserPlayer(pad,lcd); render(); }