ELEC2645 (2019/20) / Mbed 2 deprecated ELEC2645_Project_el18jkeo

Dependencies:   mbed

Revision:
14:e88bcf5c0887
Parent:
12:be491ab6e742
Child:
15:dde4ce4bf7fe
--- a/SpaceInvaderEngine/SpaceInvaderEngine.h	Wed Apr 01 16:00:44 2020 +0000
+++ b/SpaceInvaderEngine/SpaceInvaderEngine.h	Fri Apr 03 11:19:53 2020 +0000
@@ -22,8 +22,9 @@
     void update(Gamepad &pad, N5110 &lcd);
     void render(N5110 &lcd);
     void shoot_bullet();
-    void SpaceInvaderEngine::get_ship_pos();
-    
+    void get_ship_pos();
+    void ship_bullet_alien_collision(Gamepad &pad, N5110 &lcd);
+ 
 private:
 
     Armada A1;
@@ -38,15 +39,12 @@
     int RS;
     
     int A1y;
-    int BS1x;
-    int BS1y;
+    int S1x;
+    int S1y;
     
     
     Direction D;
     float Mag;
-
-    vector<Bullet> BulletS;
-    
     
 };