Diff: Gameengine/Gameengine.cpp

Revision:

37:4d525a37d5d2

Parent:

36:203ec93b4cc7

Child:

38:55bb9da08a52

diff -r 203ec93b4cc7 -r 4d525a37d5d2 Gameengine/Gameengine.cpp
--- a/Gameengine/Gameengine.cpp	Fri Apr 12 03:36:04 2019 +0000
+++ b/Gameengine/Gameengine.cpp	Fri Apr 12 18:10:11 2019 +0000
@@ -19,13 +19,10 @@
     _lives = 3;
 }
 
-/*void Levelobjects::get_miner_pos()
+void Gameengine::get_miner_pos()
 {
-    Vector2D p = _miner.get_pos();
-
-    printf("miner x %f \n", p.x);
-    printf("miner y %f \n", p.y);
-}*/
+    Vector2D p = _sprites.get_pos();
+}
 
 void Gameengine::read_direction(Gamepad &pad)
 {
@@ -36,6 +33,7 @@
 {
     t.start();
     read_direction(pad);
+    get_miner_pos();
     _sprites.miner_move(_d, lcd);
     _sprites.miner_gravity(lcd);
     _sprites.miner_jump(lcd, pad);
@@ -49,10 +47,12 @@
 
 }
 
-void Gameengine::draw(keyed _k, N5110 &lcd, Gamepad &pad)
+void Gameengine::draw(N5110 &lcd, Gamepad &pad)
 {
     if (_level_select == 1) {
 
+        _l1.trap_pos();
+        _l1.key_pos();
         _sprites.enemy_collision(0);
         _sprites.enemy_collision(1);
         _sprites.miner_draw(lcd);
@@ -61,12 +61,7 @@
         _sprites.blocks(_d, 1,49,36, lcd);
         _sprites.blocks(_d, 0,42,22, lcd);
         _sprites.keys_collected();
-        //_l1.traps(lcd);
-        _sprites.key_collect(0, 79, 12, lcd, pad);
-        _sprites.key_collect(1, 36, 22, 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);
+        key_draw(lcd, pad);
 
     }
     if(_level_select == 2) {
@@ -119,18 +114,22 @@
 
 bool Gameengine::trap_death(N5110 &lcd)
 {
-    if(_sprites.trap (0, 25, 44, lcd) || _sprites.trap(1,58, 6, lcd) ||
-        _sprites.trap(2, 75, 6, lcd) || _sprites.trap(3,23,6,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)) {
         return true;
     } else {
         return false;
     }
 }
 
-/*void Gameengine::solid_blocks(N5110 &lcd)
-{   
-    _sprites.blocks(0, 49,37, lcd);
-    _sprites.blocks(1, 42,22, lcd);
-    //_sprites.blocks(42,6, lcd);
-    //_sprites.blocks(47,6, lcd);
-}*/
\ No newline at end of file
+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);
+}
\ No newline at end of file