diff options
| author | Kelly Rauchenberger <fefferburbia@gmail.com> | 2015-03-11 11:15:28 -0400 |
|---|---|---|
| committer | Kelly Rauchenberger <fefferburbia@gmail.com> | 2015-03-11 11:15:28 -0400 |
| commit | ea0a959c2405511255080cae9f9558f2711a887f (patch) | |
| tree | 4ca85bad4d709396c5197374c0cf6a33bbff895b /src/components.h | |
| parent | 0e0389752a0912614737e5c059b5cd4719ef9cf2 (diff) | |
| download | therapy-ea0a959c2405511255080cae9f9558f2711a887f.tar.gz therapy-ea0a959c2405511255080cae9f9558f2711a887f.tar.bz2 therapy-ea0a959c2405511255080cae9f9558f2711a887f.zip | |
Fixed bug where one could fall through the floor after changing maps
Diffstat (limited to 'src/components.h')
| -rw-r--r-- | src/components.h | 2 |
1 files changed, 1 insertions, 1 deletions
| diff --git a/src/components.h b/src/components.h index 985025c..2585d73 100644 --- a/src/components.h +++ b/src/components.h | |||
| @@ -83,7 +83,7 @@ class MapCollisionComponent : public Component { | |||
| 83 | }; | 83 | }; |
| 84 | 84 | ||
| 85 | void addCollision(int axis, int lower, int upper, Direction dir, int type); | 85 | void addCollision(int axis, int lower, int upper, Direction dir, int type); |
| 86 | void processCollision(Game& game, Entity& collider, Collision collision, Direction dir); | 86 | bool processCollision(Game& game, Entity& collider, Collision collision, Direction dir); |
| 87 | 87 | ||
| 88 | std::list<Collision> left_collisions; | 88 | std::list<Collision> left_collisions; |
| 89 | std::list<Collision> right_collisions; | 89 | std::list<Collision> right_collisions; |