Diff: Sprites/Sprites.h

Revision:

37:4d525a37d5d2

Parent:

36:203ec93b4cc7

Child:

38:55bb9da08a52

--- a/Sprites/Sprites.h	Fri Apr 12 03:36:04 2019 +0000
+++ b/Sprites/Sprites.h	Fri Apr 12 18:10:11 2019 +0000
@@ -85,18 +85,6 @@
     
 };
 
-struct keyed {
-    bool key[5];
-    double kx[5];
-    double ky[5];
-};
-
-struct trap_str {
-    bool trap[5];
-    double tx[5];
-    double ty[5];
-};
-
 class Sprites
 {
 
@@ -109,7 +97,7 @@
     void miner_move(Direction d, N5110 &lcd);
     void miner_draw(N5110 &lcd);
     void miner_gravity(N5110 &lcd);
-    void miner_jump(N5110 &lcd, Gamepad &pad);
+    int miner_jump(N5110 &lcd, Gamepad &pad);
     void miner_land(N5110 &lcd);
     
     void enemy_init(int i, int x, int y, int d);
@@ -121,7 +109,7 @@
     
     bool exit_level(int x, int y, N5110 &lcd);
     
-    bool trap(int t, int x, int y, N5110 &lcd);
+    bool trap(int x, int y, N5110 &lcd);
     void blocks(Direction d, int b, int x, int y, N5110 &lcd);
     void soft_blocks(int x, int y, N5110 &lcd);
     
@@ -142,16 +130,15 @@
     bool left_collision;
     
     bool _collision;
-    keyed _k;
     int _keys;
     
     double bx[5];
     double by[5];
-    trap_str _trap;
     enemies _enem;
-    
-        int cx;
-    int cy;
+    bool _key[5];
+    double kx[5];
+    double ky[5];
+
     
 };
 #endif
\ No newline at end of file