Diff: Gameengine/Gameengine.cpp

Revision:

31:ed5f7f15a1ed

Parent:

29:d85886364643

diff -r 6d6b48fe3679 -r ed5f7f15a1ed Gameengine/Gameengine.cpp
--- a/Gameengine/Gameengine.cpp	Wed Apr 10 14:29:14 2019 +0000
+++ b/Gameengine/Gameengine.cpp	Wed Apr 10 16:20:28 2019 +0000
@@ -4,6 +4,7 @@
 {
     _turn_flag = 0;
     _counter =0;
+
 }
 
 Gameengine::~Gameengine()
@@ -13,19 +14,19 @@
 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;
 }
 
-/*void Levelobjects::get_miner_pos()
+void Gameengine::get_miner_pos()
 {
-    Vector2D p = _miner.get_pos();
+    Vector2D p = _sprites.get_pos();
 
-    printf("miner x %f \n", p.x);
-    printf("miner y %f \n", p.y);
-}*/
+    //printf("miner x %f \n", p.x);
+    //printf("miner y %f \n", p.y);
+}
 
 void Gameengine::read_direction(Gamepad &pad)
 {
@@ -37,37 +38,36 @@
     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_collision(0);
+    _sprites.enemy_collision(1);
+    _sprites.enemy_move(0, 0.5, lcd);
+    _sprites.enemy_move(1, 1, lcd);
+
 }
 
 void Gameengine::draw(Key _k, N5110 &lcd, Gamepad &pad)
 {
     if (_level_select == 1) {
-        
-        _miner.enemy_collision(0);
-        _miner.enemy_collision(1);
-        _miner.miner_draw(lcd);
+
+        _sprites.miner_draw(lcd);
         _l1.level_platforms(lcd);
         _l1.soft_blocks(lcd);
         _l1.solid_blocks(lcd);
-        _l1.keys(lcd, pad);
-        _l1.keys_collected();
+        keys(lcd, pad);
+        keys_collected();
         _l1.traps(lcd);
 
     }
     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());
     }
@@ -75,13 +75,63 @@
 
 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);
     }
 }
 
+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;
+    }
+}
+
+bool Gameengine::exit_level(int x, int y, N5110 &lcd)
+{
+    lcd.drawSprite(x,y,6,5,(int *)door);
+
+    if(_keys == 5 && lcd.getPixel(x-1, y+5)) {
+        return true;
+    } else {
+        return false;
+    }
+}
+
+void Gameengine::next_level(N5110 &lcd)
+{
+    if(_game.level1_exit(lcd) == true) {
+        t.stop();
+        _level_select = 2;
+        _sprites.miner_init(3,0);
+        printf("Final score is %f \n ",_lives * (60 - t.read())+ (10 * _l1.keys_collected()));
+    }
+}
+
+bool Game::level1_exit(N5110 &lcd)
+{
+    if(_level.exit_level(78,41,lcd) == true) {
+        return true;
+    } else {
+        return false;
+    }
+}
+
+bool Level1::level1_exit(N5110 &lcd)
+{
+    if(_level.exit_level(78,41,lcd) == true) {
+        return true;
+    } else {
+        return false;
+    }
+}
+
 bool Gameengine::game_over()
 {
     if(_lives == 0 || t.read() > 60) {
@@ -90,14 +140,4 @@
     } else {
         return false;
     }
-}
-
-void Gameengine::next_level(N5110 &lcd)
-{
-    if(_l1.level1_exit(lcd) == true) {
-        t.stop();
-        _level_select = 2;
-        _miner.miner_init(3,0);
-        printf("Final score is %f \n ",_lives * (60 - t.read())+ (10 * _l1.keys_collected()));
-    }
 }
\ No newline at end of file