diff options
Diffstat (limited to 'src/transform_system.h')
| -rw-r--r-- | src/transform_system.h | 11 |
1 files changed, 4 insertions, 7 deletions
| diff --git a/src/transform_system.h b/src/transform_system.h index 7fa3423..476b8d8 100644 --- a/src/transform_system.h +++ b/src/transform_system.h | |||
| @@ -5,6 +5,7 @@ | |||
| 5 | #include <set> | 5 | #include <set> |
| 6 | #include <map> | 6 | #include <map> |
| 7 | #include <tuple> | 7 | #include <tuple> |
| 8 | #include <list> | ||
| 8 | #include "direction.h" | 9 | #include "direction.h" |
| 9 | #include "system.h" | 10 | #include "system.h" |
| 10 | #include "vector.h" | 11 | #include "vector.h" |
| @@ -13,15 +14,11 @@ | |||
| 13 | 14 | ||
| 14 | class Game; | 15 | class Game; |
| 15 | 16 | ||
| 16 | struct AxisResult { | 17 | struct CollisionResult { |
| 17 | Direction dir; | 18 | Direction dir; |
| 18 | bool blocked = false; | 19 | bool blocked = false; |
| 19 | int colliderSprite = -1; | 20 | std::list<int> colliders; |
| 20 | }; | 21 | vec2i adjustedLoc; |
| 21 | |||
| 22 | struct CollisionResult { | ||
| 23 | AxisResult horiz; | ||
| 24 | AxisResult vert; | ||
| 25 | }; | 22 | }; |
| 26 | 23 | ||
| 27 | class TransformSystem : public System { | 24 | class TransformSystem : public System { |