Diff: Gameengine/Gameengine.cpp

Revision:

33:023f57d52b1c

Parent:

29:d85886364643

Child:

34:c5a042973e0c

diff -r 5dc769ba4a58 -r 023f57d52b1c Gameengine/Gameengine.cpp
--- a/Gameengine/Gameengine.cpp	Wed Apr 10 17:19:51 2019 +0000
+++ b/Gameengine/Gameengine.cpp	Wed Apr 10 17:56:13 2019 +0000
@@ -13,9 +13,9 @@
 void Gameengine::game_init()
 {
     _level_select = 1;
-    _miner.miner_init(3, 33);
-    _miner.enemy_init(1, 22, 42, 40);
-    _miner.enemy_init(0, 22, 20, 40);
+    _sprites.miner_init(3, 33);
+    _sprites.enemy_init(1, 22, 42, 40);
+    _sprites.enemy_init(0, 22, 20, 40);
     _lives = 3;
 }
 
@@ -37,16 +37,16 @@
     t.start();
     read_direction(pad);
     //get_miner_pos();
-    _miner.miner_move(_d, lcd);
-    _miner.miner_gravity(lcd);
-    _miner.miner_jump(lcd, pad);
-    _miner.miner_land(lcd);
+    _sprites.miner_move(_d, lcd);
+    _sprites.miner_gravity(lcd);
+    _sprites.miner_jump(lcd, pad);
+    _sprites.miner_land(lcd);
     lose_life(lcd);
     game_over();
     next_level(lcd);
     
-    _miner.enemy_move(0, 0.5, lcd);
-    _miner.enemy_move(1, 1, lcd);
+    _sprites.enemy_move(0, 0.5, lcd);
+    _sprites.enemy_move(1, 1, lcd);
     
 }
 
@@ -54,9 +54,9 @@
 {
     if (_level_select == 1) {
         
-        _miner.enemy_collision(0);
-        _miner.enemy_collision(1);
-        _miner.miner_draw(lcd);
+        _sprites.enemy_collision(0);
+        _sprites.enemy_collision(1);
+        _sprites.miner_draw(lcd);
         _l1.level_platforms(lcd);
         _l1.soft_blocks(lcd);
         _l1.solid_blocks(lcd);
@@ -67,17 +67,28 @@
     }
     if(_level_select == 2) {
 
-        _miner.miner_draw(lcd);
+        _sprites.miner_draw(lcd);
         lcd.drawLine(0,47,83,47,1);
         //printf("level 2 time = %f \n", t.read());
     }
 }
 
+bool Gameengine::enemy_death()
+{
+    if(_sprites.enemy_collision(0) || _sprites.enemy_collision(1) ||
+    _sprites.enemy_collision(2) || _sprites.enemy_collision(3))
+
+        return true;
+    else {
+        return false;
+    }
+}
+
 void Gameengine::lose_life(N5110 &lcd)
 {
-    if (_l1.traps(lcd) == 1 || _miner.enemy_collision(0) == true) {
+    if (_l1.traps(lcd) == 1 || enemy_death() == true) {
         _lives--;
-        _miner.miner_init(3, 33);
+        _sprites.miner_init(3, 33);
         wait(1);
     }
 }
@@ -97,7 +108,7 @@
     if(_l1.level1_exit(lcd) == true) {
         t.stop();
         _level_select = 2;
-        _miner.miner_init(3,0);
+        _sprites.miner_init(3,0);
         printf("Final score is %f \n ",_lives * (60 - t.read())+ (10 * _l1.keys_collected()));
     }
 }
\ No newline at end of file