Diff: Levelengine/Levelengine.h

Revision:

25:7fb1b6fa9137

Parent:

24:9c7aca60e374

diff -r 9c7aca60e374 -r 7fb1b6fa9137 Levelengine/Levelengine.h
--- a/Levelengine/Levelengine.h	Mon Apr 08 18:17:10 2019 +0000
+++ b/Levelengine/Levelengine.h	Mon Apr 08 22:31:07 2019 +0000
@@ -5,25 +5,22 @@
 #include "N5110.h"
 #include "Gamepad.h"
 
-const int solid_block[9] =   {
+const int big_block[9] =   {
         1,1,1,
         1,0,1,
         1,1,1,
-
     };
     
 const int key[12] =   {
         1,1,0,0,
         1,0,1,1,
         1,1,0,1,
-
     };
 
 const int key_collected[12] =   {
         0,0,0,0,
         0,0,0,0,
         0,0,0,0,
-
     };
     
 const int spike[9] =   {
@@ -31,8 +28,6 @@
         1,1,1,
         0,1,0,
         1,1,1,
- 
-
     };
     
 const int door[30] = {
@@ -43,12 +38,11 @@
         1,0,1,0,1,
         1,1,0,1,1,
         1,0,1,0,1,
-};
+};    
 
 typedef struct {
     bool key[5];
-} Key;
-    
+    } Key;
 
 class Levelengine
 {
@@ -58,18 +52,12 @@
     ~Levelengine();
     
     void soft_blocks(int x, int y, N5110 &lcd);
-    void draw_solid_block(int x, int y, N5110 &lcd);
-    
+    bool solid_block(int x, int y, N5110 &lcd);
     void key_collect(int k, int x, int y, N5110 &lcd, Gamepad &pad);
-    int keys_collected();
+    bool trap(int x, int y, N5110 &lcd);
+    bool exit(int x, int y, N5110 &lcd);
     
-    int spike1(int x, int y, N5110 &lcd);
-    int spike2(int x, int y, N5110 &lcd);
-    int spike3(int x, int y, N5110 &lcd);
-    int spike4(int x, int y, N5110 &lcd);
-    
-    bool exit(int x, int y, N5110 &lcd);
-    Key _k;
+    int keys_collected();
 
 private:
 
@@ -80,7 +68,8 @@
     bool key_collect4; 
     bool key_collect5;
     int _keys;
-       
+    Key _k;  
+    
     
 };