Haoyan Zhang
/
el17h2z1
deemo1
Diff: StarcraftEngine/StarcraftEngine.h
- Revision:
- 4:9fa0c5edd1a1
- Parent:
- 3:1db91ad3ab84
--- a/StarcraftEngine/StarcraftEngine.h Tue May 12 15:13:22 2020 +0000 +++ b/StarcraftEngine/StarcraftEngine.h Tue May 12 15:54:51 2020 +0000 @@ -8,6 +8,7 @@ #include "Laser.h" #include "Swarm.h" #include "Boss.h" +#include "Acid.h" // gap from edge of screen #define GAP 2 @@ -26,7 +27,7 @@ StarcraftEngine(); ~StarcraftEngine(); - void init(int Battleship_height, int Battleship_width, int Laser_height, int Laser_width, int Swarm_height, int Swarm_width,int Boss_height, int Boss_width, int speed); + void init(int Battleship_height, int Battleship_width, int Laser_height, int Laser_width, int Swarm_height, int Swarm_width,int Boss_height, int Boss_width, int Acid_height, int Acid_width,int speed); void read_input(Gamepad &pad); int find_life(); int find_score(); @@ -36,6 +37,7 @@ private: void check_Swarm_collisions(Gamepad &pad); void check_Boss_collisions(Gamepad &pad); + void check_Battleship_collisions(Gamepad &pad); void check_goal(Gamepad &pad); void print_scores(N5110 &lcd); @@ -59,6 +61,10 @@ int _Boss_height; int _Boss_width; + Acid _Acid; + int _Acid_height; + int _Acid_width; + Direction _d; float _mag; };