ELEC2645 (2018/19) / Mbed 2 deprecated el17arm

Dependencies:   mbed

Revision:
32:5dc769ba4a58
Parent:
27:e73dd64ef334
Child:
33:023f57d52b1c
--- a/Level1/Level1.cpp	Wed Apr 10 14:29:14 2019 +0000
+++ b/Level1/Level1.cpp	Wed Apr 10 17:19:51 2019 +0000
@@ -24,37 +24,37 @@
 
 void Level1::soft_blocks(N5110 &lcd)
 {
-    _level.soft_blocks(46, 8, lcd);
-    _level.soft_blocks(52, 8, lcd);
-    _level.soft_blocks(55, 36, lcd);
-    _level.soft_blocks(33, 8, lcd);
-    _level.soft_blocks(27, 8, lcd);
-    _level.soft_blocks(59, 36, lcd);
+    _miner.soft_blocks(46, 8, lcd);
+    _miner.soft_blocks(52, 8, lcd);
+    _miner.soft_blocks(55, 36, lcd);
+    _miner.soft_blocks(33, 8, lcd);
+    _miner.soft_blocks(27, 8, lcd);
+    _miner.soft_blocks(59, 36, lcd);
 }
 
 void Level1::solid_blocks(N5110 &lcd)
 {   
-    _level.draw_solid_block(49,37, lcd);
-    _level.draw_solid_block(52,37, lcd);
-    _level.draw_solid_block(45,22, lcd);
-    _level.draw_solid_block(42,22, lcd);
+    _miner.draw_solid_block(49,37, lcd);
+    _miner.draw_solid_block(52,37, lcd);
+    _miner.draw_solid_block(45,22, lcd);
+    _miner.draw_solid_block(42,22, lcd);
 }
 
 void Level1::keys(N5110 &lcd, Gamepad &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);
+    _miner.key_collect(0, 79, 12, lcd, pad);
+    _miner.key_collect(1, 36, 22, lcd, pad);
+    _miner.key_collect(2, 40, 6, lcd, pad);
+    _miner.key_collect(3, 62, 6, lcd, pad);
+    _miner.key_collect(4, 75, 0, lcd, pad);
 
 }
 
 int Level1::traps(N5110 &lcd)
 {
-    if(_level.trap(25, 45, lcd) || _level.trap(58, 7, lcd) ||
-            _level.trap(75, 7, lcd) || _level.trap(23,7,lcd)) {
+    if(_miner.trap(25, 45, lcd) || _miner.trap(58, 7, lcd) ||
+            _miner.trap(75, 7, lcd) || _miner.trap(23,7,lcd)) {
         return 1;
     } else {
         return 0;
@@ -64,13 +64,13 @@
 int Level1::keys_collected()
 {
     
-    int k =_level.keys_collected();
+    int k =_miner.keys_collected();
     return k;
 }
 
 bool Level1::level1_exit(N5110 &lcd)
 {
-    if(_level.exit_level(78,41,lcd) == true) {
+    if(_miner.exit_level(78,41,lcd) == true) {
         return true;
     } else {
         return false;