Diff: Room/Room.h

Revision:

28:98848e6a77a2

Parent:

27:a1b41626f57c

Child:

29:6b8411bb040a

--- a/Room/Room.h	Mon Apr 29 10:39:09 2019 +0000
+++ b/Room/Room.h	Thu May 02 21:30:49 2019 +0000
@@ -13,15 +13,16 @@
 {
     private:
     bool _doorways[4];
-    int _type;
+    int _room_type;
     int _current_map[3][48][84];
     
     // Functions
     void overlap(int x, int y, int width, int height, int * object, int * map);
+    void overlap_wall(int side);
     
     public:
     // Constructors
-    Room();
+    Room(int no_of_enemies);
     // Deconstructors
     ~Room();
     
@@ -29,41 +30,43 @@
     int * get_current_map_2d();
     
     // Functions
-    void init();
+    void load();
+    void unload();
     void draw_room(N5110 &lcd);
     void draw_room_overlay(N5110 &lcd);
     
     // Variables
     Entity *enemies[MAX_ENEMIES];
     bool valid_enemies[MAX_ENEMIES];
+    int enemies_type[MAX_ENEMIES];
 };
 
 const int wall_x[2][11][3] = { // [E/W][Size_Y][Size_X]
     {   // E
-        {1,0,0},
-        {1,0,0},
-        {1,0,0},
-        {1,0,0},
-        {1,0,0},
-        {1,0,0},
-        {1,0,0},
-        {1,0,0},
-        {1,0,0},
-        {1,0,0},
-        {1,0,0},
+        {1,2,2},
+        {1,2,2},
+        {1,2,2},
+        {1,2,2},
+        {1,2,2},
+        {1,2,2},
+        {1,2,2},
+        {1,2,2},
+        {1,2,2},
+        {1,2,2},
+        {1,2,2},
     },
     {   // W
-        {0,0,1},
-        {0,0,1},
-        {0,0,1},
-        {0,0,1},
-        {0,0,1},
-        {0,0,1},
-        {0,0,1},
-        {0,0,1},
-        {0,0,1},
-        {0,0,1},
-        {0,0,1},
+        {2,2,1},
+        {2,2,1},
+        {2,2,1},
+        {2,2,1},
+        {2,2,1},
+        {2,2,1},
+        {2,2,1},
+        {2,2,1},
+        {2,2,1},
+        {2,2,1},
+        {2,2,1},
     }
 };
 
@@ -102,8 +105,8 @@
     },
     {
         {1,1,1,1,1,1,1,1,1,1,1,1,},
-        {0,0,0,0,0,0,0,0,0,0,0,0,},
-        {0,0,0,0,0,0,0,0,0,0,0,0,},
+        {2,2,2,2,2,2,2,2,2,2,2,2,},
+        {2,2,2,2,2,2,2,2,2,2,2,2,},
     },
 };