ELEC2645 (2018/19) / Mbed 2 deprecated el17arm

Dependencies:   mbed

Revision:
26:bce40bf4c9fc
Parent:
24:9c7aca60e374
--- a/Gameengine/Gameengine.cpp	Mon Apr 08 18:17:10 2019 +0000
+++ b/Gameengine/Gameengine.cpp	Tue Apr 09 01:36:47 2019 +0000
@@ -12,9 +12,18 @@
 {
     _level_select = 1;
     _miner.miner_init(3, 33);
+    _l1.enemy_init(22, 20, 0);
     _lives = 3;
 }
 
+/*void Gameengine::miner_pos()
+{
+    Vector2D miner_pos = _miner.get_pos();
+
+    printf("miner x %f \n", miner_pos.x);
+    printf("miner y %f \n", miner_pos.y);
+}*/
+
 void Gameengine::read_direction(Gamepad &pad)
 {
     _d = pad.get_direction();
@@ -43,7 +52,9 @@
         _l1.solid_blocks(lcd);
         _l1.keys(lcd, pad);
         _l1.keys_collected();
-        _l1.spikes(lcd);
+        _l1.traps(lcd);
+        _l1.enemies_right(lcd);
+        _l1.enemies_left(lcd);
     }
     if(_level_select == 2) {
         
@@ -56,7 +67,7 @@
 void Gameengine::lose_life(N5110 &lcd)
 {
 
-    if (_l1.spikes(lcd) == 1) {
+    if (_l1.traps(lcd) == 1) {
         _lives--;
         _miner.miner_init(3, 33);
         wait(0.5);