Diff: Sprites/Sprites.h

Revision:

41:0cf320f73424

Parent:

40:913339e324b8

Child:

43:1ec6b6293c6b

--- a/Sprites/Sprites.h	Mon Apr 15 02:01:41 2019 +0000
+++ b/Sprites/Sprites.h	Tue Apr 16 02:01:53 2019 +0000
@@ -4,9 +4,10 @@
 #include "mbed.h"
 #include "N5110.h"
 #include "Gamepad.h"
-//#include "rtos.h"
+
 
 const int miner_right[24] =   {
+        
         1,1,1,
         1,1,0,
         1,1,1,
@@ -19,6 +20,7 @@
     };
 
     const int miner_left[24] =   {
+        
         1,1,1,
         0,1,1,
         1,1,1,
@@ -39,6 +41,7 @@
     };
     
 const int key[12] =   {
+        
         1,1,0,0,
         1,0,1,1,
         1,1,0,1,
@@ -101,7 +104,6 @@
     int c[5];
     int d[5];
     double v[5];
-
 };
 
 struct Traps {
@@ -120,9 +122,9 @@
 };
 
 struct Soft_blocks {
-    double sx[5];
+    double sx1[5];
     double sy[5];
-    int sz[5];
+    int sx2[5];
 };
 
 struct Level_exit {
@@ -137,6 +139,7 @@
     
     Sprites();
     ~Sprites();
+    Vector2D get_pos();
     
     void miner_init(int x, int y);
     int miner_move(Direction d, N5110 &lcd);
@@ -152,14 +155,12 @@
     void key_collect(int k, int x, int y, N5110 &lcd, Gamepad &pad);
     int keys_collected();
     
-    bool exit_level(int x, int y, N5110 &lcd);
-    
     bool trap(int x, int y, N5110 &lcd);
     void blocks(Direction d, int x, int y, N5110 &lcd);
     void soft_blocks(int x, int y, int z, N5110 &lcd);
     
-    Vector2D get_pos();
-
+    bool exit_level(int x, int y, N5110 &lcd);
+    
     keyed _k;
 
 private:
@@ -186,8 +187,6 @@
     double kx[5];
     double ky[5];
     
-    enemies_init _enem;
-    
-    
+    enemies_init _enem;    
 };
 #endif
\ No newline at end of file