Diff: Gameengine/Gameengine.cpp

Revision:

39:ddca28745388

Parent:

38:55bb9da08a52

--- a/Gameengine/Gameengine.cpp	Sun Apr 14 15:18:58 2019 +0000
+++ b/Gameengine/Gameengine.cpp	Sun Apr 14 18:26:16 2019 +0000
@@ -2,8 +2,8 @@
 
 Gameengine::Gameengine()
 {
-    _turn_flag = 0;
-    _counter =0;
+    _turn_flag = false;
+    _enem_flag = false;
 }
 
 Gameengine::~Gameengine()
@@ -30,14 +30,6 @@
     game_over();
     next_level(lcd);
 
-    _sprites.enemy_move(0, 0.5, lcd);
-    _sprites.enemy_move(1, 1, lcd);
-
-}
-
-void Gameengine::read_direction(Gamepad &pad)
-{
-    _d = pad.get_direction();
 }
 
 void Gameengine::draw(N5110 &lcd, Gamepad &pad)
@@ -47,10 +39,8 @@
         _l1.trap_pos();
         _l1.key_pos();
         _l1.block_pos();
-        _sprites.enemy_collision(0);
-        _sprites.enemy_collision(1);
         _l1.level_platforms(lcd);
-
+        enemies(lcd);
        
         _sprites.keys_collected();
         key_draw(lcd, pad);
@@ -65,15 +55,9 @@
     }
 }
 
-bool Gameengine::enemy_death()
+void Gameengine::read_direction(Gamepad &pad)
 {
-    if(_sprites.enemy_collision(0) || _sprites.enemy_collision(1) ||
-      _sprites.enemy_collision(2) || _sprites.enemy_collision(3))
-
-        return true;
-    else {
-        return false;
-    }
+    _d = pad.get_direction();
 }
 
 void Gameengine::lose_life(N5110 &lcd)
@@ -134,7 +118,16 @@
     _sprites.blocks(_d, _l1.sol2.bx, _l1.sol2.by, lcd);
 }
 
-bool Gameengine::enemies(N5110 &lcd)
+void Gameengine::enemies(N5110 &lcd)
 {
-
+    _l1.enem_pos();
+    if(_enem_flag == false){
+    _sprites.enemy_init(0, _l1.enem1.ex, _l1.enem1.ey, _l1.enem1.d);
+    _sprites.enemy_init(1, _l1.enem2.ex, _l1.enem2.ey, _l1.enem2.d);
+    _enem_flag = true;
+    }
+    _sprites.enemy_move(0, _l1.enem1.v, lcd);
+    _sprites.enemy_move(1, _l1.enem2.v, lcd);
+    _sprites.enemy_collision(0);
+    _sprites.enemy_collision(1);
 }
\ No newline at end of file