Diff: Level1/Level1.cpp

Revision:

31:ed5f7f15a1ed

Parent:

27:e73dd64ef334

--- a/Level1/Level1.cpp	Wed Apr 10 14:29:14 2019 +0000
+++ b/Level1/Level1.cpp	Wed Apr 10 16:20:28 2019 +0000
@@ -42,13 +42,18 @@
 
 void Level1::keys(N5110 &lcd, Gamepad &pad)
 {
+    _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);
 
-    _level.key_collect(0, 79, 12, lcd, pad);
-    _level.key_collect(1, 36, 22, lcd, pad);
-    _level.key_collect(2, 40, 6, lcd, pad);
-    _level.key_collect(3, 62, 6, lcd, pad);
-    _level.key_collect(4, 75, 0, lcd, pad);
+}
 
+int Sprites::keys_collected()
+{
+    int k = _keys;
+    return k;
 }
 
 int Level1::traps(N5110 &lcd)
@@ -61,11 +66,13 @@
     }
 }
 
-int Level1::keys_collected()
+bool Level1::level1_exit(N5110 &lcd)
 {
-    
-    int k =_level.keys_collected();
-    return k;
+    if(_level.exit_level(78,41,lcd) == true) {
+        return true;
+    } else {
+        return false;
+    }
 }
 
 bool Level1::level1_exit(N5110 &lcd)