Diff: Gameengine/Gameengine.cpp

Revision:

44:e29458976114

Parent:

43:1ec6b6293c6b

Child:

45:bad704c546d4

--- a/Gameengine/Gameengine.cpp	Wed Apr 17 02:00:31 2019 +0000
+++ b/Gameengine/Gameengine.cpp	Wed Apr 17 19:57:33 2019 +0000
@@ -15,11 +15,11 @@
     _enem_flag = false;
     _key_reinit = false;
     _five_keys = 5;
-    _level = 1;
+    _level = 0;
     _sprites.miner_init(3, 33);
     _lives = 3;
     _time = 120;
-    
+
 }
 
 void Gameengine::update(N5110 &lcd, Gamepad &pad)
@@ -52,7 +52,7 @@
         _lev.soft_pos1();
         _lev.enem_pos1();
         blocks(lcd);
-        
+
     }
 }
 void Gameengine::draw_l2(N5110 &lcd, Gamepad &pad)
@@ -62,15 +62,32 @@
         _t.start();
         key_reinit();
         _lev.level_platforms2(lcd);
-        //_lev.key_pos2();
-        //_lev.trap_pos2();
+        _lev.key_pos2();
+        _lev.trap_pos2();
         _lev.block_pos2();
         _lev.soft_pos2();
-        //_lev.enem_pos2();
+        _lev.enem_pos2();
         blocks(lcd);
     }
 }
 
+void Gameengine::draw_l3(N5110 &lcd, Gamepad &pad)
+{
+    if(_level == 2) {
+
+        _t.start();
+        key_reinit();
+        _lev.level_platforms3(lcd);
+        _lev.key_pos3();
+        _lev.trap_pos3();
+        _lev.block_pos3();
+        _lev.soft_pos3();
+        _lev.enem_pos3();
+        blocks(lcd);
+        game_complete(lcd);
+    }
+}
+
 void Gameengine::read_direction(Gamepad &pad)
 {
     _d = pad.get_direction();
@@ -90,10 +107,10 @@
 {
     if(_lives == 0 || _t.read() > _time) {
         _t.stop();
-        
+
         return true;
     }
-        return false;
+    return false;
 }
 
 bool Gameengine::level_exit(N5110 &lcd)
@@ -108,12 +125,13 @@
 
 void Gameengine::next_level(N5110 &lcd)
 {
-    if(level_exit(lcd) && _sprites.keys_collected() == _five_keys) {
+    if(level_exit(lcd) && _sprites.keys_collected() > 0) {
         _t.stop();
         _total_time += (_time - _t.read());
         _level = _level++;
         _five_keys += 5;
         _sprites.miner_init(3,33);
+        _enem_flag = false;
         _key_reinit = false;
         _t.reset();
     }
@@ -172,6 +190,7 @@
 {
     int i = _level;
     if(_enem_flag == false) {
+
         _sprites.enemy_init(0, _lev.enem1.ex[i], _lev.enem1.ey[i], _lev.enem1.d[i]);
         _sprites.enemy_init(1, _lev.enem2.ex[i], _lev.enem2.ey[i], _lev.enem2.d[i]);
         _sprites.enemy_init(2, _lev.enem3.ex[i], _lev.enem3.ey[i], _lev.enem3.d[i]);
@@ -181,15 +200,15 @@
     _sprites.enemy_move(1, _lev.enem2.v[i], lcd);
     _sprites.enemy_move(2, _lev.enem3.v[i], lcd);
 
-    if(_sprites.enemy_collision(0) || _sprites.enemy_collision(1) || 
-    _sprites.enemy_collision(2)) {
+    if(_sprites.enemy_collision(0) || _sprites.enemy_collision(1) ||
+            _sprites.enemy_collision(2)) {
         return true;
     }
     return false;
 }
 
 int Gameengine::oxygen_leds()
-{    
+{
     if(_t.read() < (_time*0.33f)) {
         _oxy_state = 3;
     }
@@ -213,11 +232,19 @@
 }
 
 void Gameengine::get_score(N5110 &lcd)
-{   
+{
     float flt_score = ((_lives +1) * _total_time + (10 * _sprites.keys_collected()));
     int int_score = static_cast<int>(flt_score);
     char buffer[14];
     sprintf(buffer,"%2d",int_score);
     lcd.printString(buffer,40,2);
     printf("score = %i \n", int_score);
+}
+
+bool Gameengine::game_complete(N5110 &lcd)
+{
+    if(_level == 3) {
+        return true;
+    }
+    return false;
 }
\ No newline at end of file