From 67b24a8ddd89371cfb944c5b441c852f0edc23b1 Mon Sep 17 00:00:00 2001 From: Kelly Rauchenberger Date: Tue, 8 May 2018 21:47:57 -0400 Subject: 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. --- src/systems/pondering.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/systems/pondering.h') diff --git a/src/systems/pondering.h b/src/systems/pondering.h index 273db67..c79bbf6 100644 --- a/src/systems/pondering.h +++ b/src/systems/pondering.h @@ -51,8 +51,7 @@ private: void tickBody( id_type entity, - double dt, - const std::set& entities); + double dt); CollisionResult moveBody( id_type entity, -- cgit 1.4.1