Diff: Gameengine/Gameengine.cpp

Revision:

25:7fb1b6fa9137

Parent:

24:9c7aca60e374

--- a/Gameengine/Gameengine.cpp	Mon Apr 08 18:17:10 2019 +0000
+++ b/Gameengine/Gameengine.cpp	Mon Apr 08 22:31:07 2019 +0000
@@ -24,6 +24,7 @@
 {   
     t.start();
     read_direction(pad);
+    miner_pos();
     _miner.miner_move(_d, lcd);
     _miner.miner_gravity(lcd);
     _miner.miner_jump(lcd, pad);
@@ -43,7 +44,7 @@
         _l1.solid_blocks(lcd);
         _l1.keys(lcd, pad);
         _l1.keys_collected();
-        _l1.spikes(lcd);
+        _l1.traps(lcd);
     }
     if(_level_select == 2) {
         
@@ -56,7 +57,7 @@
 void Gameengine::lose_life(N5110 &lcd)
 {
 
-    if (_l1.spikes(lcd) == 1) {
+    if (_l1.traps(lcd) == true) {
         _lives--;
         _miner.miner_init(3, 33);
         wait(0.5);
@@ -81,4 +82,12 @@
     _miner.miner_init(3,0);
     printf("Final score is %f \n ",_lives * (60 - t.read())+ (10 * _l1.keys_collected()));
     }
+}
+
+void Gameengine::miner_pos()
+{
+    Vector2D miner_pos = _miner.get_pos();
+    
+    printf("miner x %i \n", miner_pos.x);
+    printf("miner y %i \n", miner_pos.y);
 }
\ No newline at end of file