Diff: Entity/Entity.h

Revision:

29:6b8411bb040a

Parent:

28:98848e6a77a2

Child:

32:fe6359ef9916

diff -r 98848e6a77a2 -r 6b8411bb040a Entity/Entity.h
--- a/Entity/Entity.h	Thu May 02 21:30:49 2019 +0000
+++ b/Entity/Entity.h	Sat May 04 15:39:20 2019 +0000
@@ -44,13 +44,13 @@
 
 public:
     // Function
-    virtual void move(float, float, int * map) = 0; // movement control and miscellaneous updates
+    virtual void move(float, float, int * map, bool * doorways) = 0; // movement control and miscellaneous updates
     virtual int * get_frame() = 0;
     virtual void take_damage(int) = 0;
-    bool matrix_collision_test(float pos_x, float pos_y, int * map);
     void undo_move_x(bool);
     void undo_move_y(bool);
     void update_prev_pos();
+    bool entity_to_map_collision_test(float pos_x, float pos_y, int * map, bool * doorways);
 
     // Mutator
     void set_position(float x, float y);