Diff: Entity/Headless/Headless.cpp

Revision:

29:6b8411bb040a

Parent:

28:98848e6a77a2

--- a/Entity/Headless/Headless.cpp	Thu May 02 21:30:49 2019 +0000
+++ b/Entity/Headless/Headless.cpp	Sat May 04 15:39:20 2019 +0000
@@ -24,7 +24,7 @@
     velocity = 0.25;
 }
 
-void Headless::move(float player_x, float player_y, int * map)
+void Headless::move(float player_x, float player_y, int * map, bool * doorways)
 {
     std::complex<double> pos_diff(player_x - position.x, player_y - position.y); // defining difference in position as a vector
     position.x += velocity * pos_diff.real() / std::abs(pos_diff);
@@ -40,8 +40,8 @@
         face = 3;
     }
 
-    undo_move_x(matrix_collision_test(position.x, prev_pos.y, map));
-    undo_move_y(matrix_collision_test(prev_pos.x, position.y, map));
+    undo_move_x(entity_to_map_collision_test(position.x, prev_pos.y, map, doorways));
+    undo_move_y(entity_to_map_collision_test(prev_pos.x, position.y, map, doorways));
 
     if (frame.number < frame.max) {
         frame.count++;