Diff: Gameengine/Gameengine.cpp

Revision:

38:55bb9da08a52

Parent:

37:4d525a37d5d2

Child:

39:ddca28745388

Child:

40:913339e324b8

diff -r 4d525a37d5d2 -r 55bb9da08a52 Gameengine/Gameengine.cpp
--- a/Gameengine/Gameengine.cpp	Fri Apr 12 18:10:11 2019 +0000
+++ b/Gameengine/Gameengine.cpp	Sun Apr 14 15:18:58 2019 +0000
@@ -14,26 +14,14 @@
 {
     _level_select = 1;
     _sprites.miner_init(3, 33);
-    _sprites.enemy_init(1, 22, 42, 40);
-    _sprites.enemy_init(0, 22, 20, 40);
     _lives = 3;
 }
 
-void Gameengine::get_miner_pos()
-{
-    Vector2D p = _sprites.get_pos();
-}
-
-void Gameengine::read_direction(Gamepad &pad)
-{
-    _d = pad.get_direction();
-}
-
 void Gameengine::update(N5110 &lcd, Gamepad &pad)
 {
     t.start();
     read_direction(pad);
-    get_miner_pos();
+    _sprites.miner_draw(lcd);
     _sprites.miner_move(_d, lcd);
     _sprites.miner_gravity(lcd);
     _sprites.miner_jump(lcd, pad);
@@ -47,26 +35,31 @@
 
 }
 
+void Gameengine::read_direction(Gamepad &pad)
+{
+    _d = pad.get_direction();
+}
+
 void Gameengine::draw(N5110 &lcd, Gamepad &pad)
 {
     if (_level_select == 1) {
 
         _l1.trap_pos();
         _l1.key_pos();
+        _l1.block_pos();
         _sprites.enemy_collision(0);
         _sprites.enemy_collision(1);
-        _sprites.miner_draw(lcd);
         _l1.level_platforms(lcd);
-        _l1.soft_blocks(lcd);
-        _sprites.blocks(_d, 1,49,36, lcd);
-        _sprites.blocks(_d, 0,42,22, lcd);
+
+       
         _sprites.keys_collected();
         key_draw(lcd, pad);
+        blocks(lcd);
 
     }
     if(_level_select == 2) {
 
-        _sprites.miner_draw(lcd);
+        //_sprites.miner_draw(lcd);
         lcd.drawLine(0,47,83,47,1);
         //printf("level 2 time = %f \n", t.read());
     }
@@ -75,7 +68,7 @@
 bool Gameengine::enemy_death()
 {
     if(_sprites.enemy_collision(0) || _sprites.enemy_collision(1) ||
-            _sprites.enemy_collision(2) || _sprites.enemy_collision(3))
+      _sprites.enemy_collision(2) || _sprites.enemy_collision(3))
 
         return true;
     else {
@@ -94,7 +87,7 @@
 
 bool Gameengine::game_over()
 {
-    if(_lives == 0 || t.read() > 60) {
+    if(_lives == 0 || t.read() > 120) {
         t.stop();
         return true;
     } else {
@@ -103,8 +96,8 @@
 }
 
 void Gameengine::next_level(N5110 &lcd)
-{
-    if(_l1.level1_exit(lcd) == true) {
+{   
+    if(_l1.level1_exit(lcd) && _sprites.keys_collected()) {
         t.stop();
         _level_select = 2;
         _sprites.miner_init(3,0);
@@ -115,21 +108,33 @@
 bool Gameengine::trap_death(N5110 &lcd)
 {
     if(_sprites.trap (_l1.trap1.tx, _l1.trap1.ty, lcd) ||
-            _sprites.trap(_l1.trap2.tx, _l1.trap2.ty, lcd) ||
-            _sprites.trap(_l1.trap3.tx, _l1.trap3.ty, lcd) ||
-            _sprites.trap(_l1.trap4.tx, _l1.trap4.ty, lcd)) {
+        _sprites.trap(_l1.trap2.tx, _l1.trap2.ty, lcd) ||
+        //_sprites.trap(_l1.trap3.tx, _l1.trap3.ty, lcd) ||
+        _sprites.trap(_l1.trap4.tx, _l1.trap4.ty, lcd)) {
         return true;
-    } else {
+        }
         return false;
-    }
 }
 
 void Gameengine::key_draw(N5110 &lcd, Gamepad &pad)
 {
-    printf(" key1 = %d \n", _l1.key1.k);
-    _sprites.key_collect(_l1.key1.k, _l1.key1.kx, _l1.key1.ky, lcd, pad);
-    //_sprites.key_collect(1, _l1.key2.kx, _l1.key2.ky, lcd, pad);
-    //_sprites.key_collect(2, 40, 6, lcd, pad);
-    //_sprites.key_collect(3, 62, 6, lcd, pad);
-    //_sprites.key_collect(4, 75, 0, lcd, pad);
+    _sprites.key_collect(0, _l1.key1.kx, _l1.key1.ky, lcd, pad);
+    _sprites.key_collect(1, _l1.key2.kx, _l1.key2.ky, lcd, pad);
+    _sprites.key_collect(2, _l1.key3.kx, _l1.key3.ky, lcd, pad);
+    _sprites.key_collect(3, _l1.key4.kx, _l1.key4.ky, lcd, pad);
+    _sprites.key_collect(4, _l1.key5.kx, _l1.key5.ky, lcd, pad);
+}
+
+void Gameengine::blocks(N5110 &lcd)
+{
+    _sprites.soft_blocks(_l1.sof1.sx, _l1.sof1.sy, _l1.sof1.sz, lcd);
+    _sprites.soft_blocks(_l1.sof2.sx, _l1.sof2.sy, _l1.sof2.sz, lcd);
+    _sprites.soft_blocks(_l1.sof3.sx, _l1.sof3.sy, _l1.sof3.sz, lcd);
+    _sprites.blocks(_d, _l1.sol1.bx, _l1.sol1.by, lcd);
+    _sprites.blocks(_d, _l1.sol2.bx, _l1.sol2.by, lcd);
+}
+
+bool Gameengine::enemies(N5110 &lcd)
+{
+
 }
\ No newline at end of file