Diff: Level1/Level1.cpp

Revision:

25:7fb1b6fa9137

Parent:

24:9c7aca60e374

--- a/Level1/Level1.cpp	Mon Apr 08 18:17:10 2019 +0000
+++ b/Level1/Level1.cpp	Mon Apr 08 22:31:07 2019 +0000
@@ -11,9 +11,9 @@
 void Level1::level_platforms(N5110 &lcd)
 {
     lcd.drawLine(0,47,83,47, 1);
-    lcd.drawRect(11,HEIGHT - 9, 38, 2, FILL_BLACK);
-    lcd.drawRect(65,HEIGHT - 11, 30, 2, FILL_BLACK);
-    lcd.drawRect(WIDTH - 9,HEIGHT - 19, 8, 2, FILL_BLACK);
+    lcd.drawRect(11,39, 38, 2, FILL_BLACK);
+    lcd.drawRect(65,37, 30, 2, FILL_BLACK);
+    lcd.drawRect(75,29, 8, 2, FILL_BLACK);
     lcd.drawRect(22, 25, 48, 2, FILL_BLACK);
     lcd.drawRect(0, 25, 12, 2, FILL_BLACK);
     lcd.drawRect(0, 17, 8, 2, FILL_BLACK);
@@ -34,30 +34,28 @@
 
 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);
+_level.solid_block(49,37, lcd);
+_level.solid_block(52,37, lcd);
+_level.solid_block(45,22, lcd);
+_level.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);
-    
 }
 
-int Level1::spikes(N5110 &lcd)
+bool Level1::traps(N5110 &lcd)
 {
-    if(_level.spike1(25, 45, lcd) || _level.spike1(58, 7, lcd) ||
-            _level.spike3(75, 7, lcd) || _level.spike4(23,7,lcd)) {
-        return 1;
+    if (_level.trap(25, 45, lcd) || _level.trap(58, 7, lcd) ||
+            _level.trap(75, 7, lcd) || _level.trap(23, 7, lcd)) {
+        return true;
     } else {
-        return 0;
+        return false;
     }
 }