Restrictions for moving into a space a block is moving out of

An entity can only move into a space a block is moving out of if the time it would take the entity to move into the tile is at least the time remaining for the other block to finish moving out of the space.

Also, crates can push each other now.

1 files changed, 3 insertions, 17 deletions

@@ -1,21 +1,9 @@
 #ifndef ENTITY_H_0D6CB29A
 #define ENTITY_H_0D6CB29A
 
+#include <set>
 #include "vector.h"
-
-enum class ColliderType {
-  player,
-  train,
-  other
-};
-
-enum class Direction {
-  none,
-  left,
-  right,
-  up,
-  down
-};
+#include "enums.h"
 
 class Entity {
 public:
@@ -39,9 +27,7 @@ public:
 
   // Collision
   ColliderType colliderType = ColliderType::other;
-
-  bool playerCanPush = false;
-  bool trainCanPush = false;
+  std::set<ColliderType> canBePushedBy;
 
   // Temp
   int colorVal = 25;