ELEC2645 (2018/19) / Mbed 2 deprecated el17arm

Dependencies:   mbed

Revision:
36:203ec93b4cc7
Parent:
34:c5a042973e0c
Child:
37:4d525a37d5d2
--- a/Sprites/Sprites.h	Thu Apr 11 21:29:48 2019 +0000
+++ b/Sprites/Sprites.h	Fri Apr 12 03:36:04 2019 +0000
@@ -122,7 +122,7 @@
     bool exit_level(int x, int y, N5110 &lcd);
     
     bool trap(int t, int x, int y, N5110 &lcd);
-    void blocks(int b, 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);
     
     Vector2D get_pos();
@@ -138,15 +138,20 @@
     int _j_counter;
     
     bool block[5];
+    bool right_collision;
+    bool left_collision;
+    
+    bool _collision;
+    keyed _k;
+    int _keys;
+    
     double bx[5];
     double by[5];
-    
-    keyed _k;
-    int _keys;
-    bool _collision;
-    
     trap_str _trap;
     enemies _enem;
     
+        int cx;
+    int cy;
+    
 };
 #endif
\ No newline at end of file