Fixed ferries pushing passengers

Ferries now pretend that their passengers have already moved by the appropriate delta when detecting collision in the direction of their passengers. This allows a ferry to move into the space where their passengers are when there is nothing else blocking it. It also allows for special behavior when a passenger is crushed between its ferry and a wall, but this is not yet implemented.

This fixes the first issue described in 8f1c4f1 -- that ferries cannot push their passengers. With this fix, ferries are basically functional.

1 files changed, 3 insertions, 2 deletions

@@ -5,6 +5,7 @@
 #include "component.h"
 #include "entity_manager.h"
 #include "vector.h"
+#include "direction.h"
 
 class PonderableComponent : public Component {
 public:
@@ -84,11 +85,11 @@ public:
   id_type ferry;
 
   /**
-   * The location of the body relative to the location of its ferry.
+   * The side of the ferry that the body is resting on, if there is one.
    *
    * @managed_by PonderingSystem
    */
-  vec2d rel = { 0.0, 0.0 };
+  Direction ferrySide;
 
   /**
    * The bodies that are being ferried by this body.