diff options
| author | Kelly Rauchenberger <fefferburbia@gmail.com> | 2018-05-08 21:47:57 -0400 |
|---|---|---|
| committer | Kelly Rauchenberger <fefferburbia@gmail.com> | 2018-05-09 17:59:13 -0400 |
| commit | 67b24a8ddd89371cfb944c5b441c852f0edc23b1 (patch) | |
| tree | d52c054e35e680bcc65c0acafc924dc1deb6c50e /src/systems/pondering.h | |
| parent | 5c82f052c26303318e81ddd76475c1d188cc74f4 (diff) | |
| download | therapy-67b24a8ddd89371cfb944c5b441c852f0edc23b1.tar.gz therapy-67b24a8ddd89371cfb944c5b441c852f0edc23b1.tar.bz2 therapy-67b24a8ddd89371cfb944c5b441c852f0edc23b1.zip | |
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.
Diffstat (limited to 'src/systems/pondering.h')
| -rw-r--r-- | src/systems/pondering.h | 3 |
1 files changed, 1 insertions, 2 deletions
| 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: | |||
| 51 | 51 | ||
| 52 | void tickBody( | 52 | void tickBody( |
| 53 | id_type entity, | 53 | id_type entity, |
| 54 | double dt, | 54 | double dt); |
| 55 | const std::set<id_type>& entities); | ||
| 56 | 55 | ||
| 57 | CollisionResult moveBody( | 56 | CollisionResult moveBody( |
| 58 | id_type entity, | 57 | id_type entity, |