ELEC2645 (2018/19) / Mbed 2 deprecated el17arm

Dependencies:   mbed

Revision:
34:c5a042973e0c
Parent:
33:023f57d52b1c
Child:
37:4d525a37d5d2
--- a/Level1/Level1.cpp	Wed Apr 10 17:56:13 2019 +0000
+++ b/Level1/Level1.cpp	Thu Apr 11 21:29:48 2019 +0000
@@ -32,32 +32,17 @@
     _sprites.soft_blocks(59, 36, lcd);
 }
 
-void Level1::solid_blocks(N5110 &lcd)
-{   
-    _sprites.draw_solid_block(49,37, lcd);
-    _sprites.draw_solid_block(52,37, lcd);
-    _sprites.draw_solid_block(45,22, lcd);
-    _sprites.draw_solid_block(42,22, lcd);
-}
 
-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);
-
-}
 
 int Level1::traps(N5110 &lcd)
 {
-    if(_sprites.trap(25, 45, lcd) || _sprites.trap(58, 7, lcd) ||
-            _sprites.trap(75, 7, lcd) || _sprites.trap(23,7,lcd)) {
-        return 1;
+    bool t = _sprites.trap(0, 25, 45, lcd);
+    printf("level trap 1 %d \n", t);
+    if(_sprites.trap(0, 25, 45, lcd) || _sprites.trap(1,58, 7, lcd) ||
+            _sprites.trap(2, 75, 7, lcd) || _sprites.trap(3,23,7,lcd)) {
+        return true;
     } else {
-        return 0;
+        return false;
     }
 }