diff options
author | Kelly Rauchenberger <fefferburbia@gmail.com> | 2015-03-18 09:48:43 -0400 |
---|---|---|
committer | Kelly Rauchenberger <fefferburbia@gmail.com> | 2015-03-18 09:48:43 -0400 |
commit | 2ec163612042bfa5e4e1bf220b489506f7039677 (patch) | |
tree | ead735eb871c3faf813635d08a89ec48195dab35 /src/components/map_collision.h | |
parent | dc0f0d6fa178403080658887af3ca1a6c0e41188 (diff) | |
download | therapy-2ec163612042bfa5e4e1bf220b489506f7039677.tar.gz therapy-2ec163612042bfa5e4e1bf220b489506f7039677.tar.bz2 therapy-2ec163612042bfa5e4e1bf220b489506f7039677.zip |
Game can now read map file from map editor (also added new map)
Diffstat (limited to 'src/components/map_collision.h')
-rw-r--r-- | src/components/map_collision.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/components/map_collision.h b/src/components/map_collision.h index 3b718b6..18b9397 100644 --- a/src/components/map_collision.h +++ b/src/components/map_collision.h | |||
@@ -2,9 +2,9 @@ | |||
2 | #define MAP_COLLISION_H | 2 | #define MAP_COLLISION_H |
3 | 3 | ||
4 | #include "entity.h" | 4 | #include "entity.h" |
5 | #include "map.h" | ||
5 | #include <list> | 6 | #include <list> |
6 | 7 | ||
7 | class Map; | ||
8 | class Game; | 8 | class Game; |
9 | 9 | ||
10 | class MapCollisionComponent : public Component { | 10 | class MapCollisionComponent : public Component { |
@@ -35,6 +35,7 @@ class MapCollisionComponent : public Component { | |||
35 | 35 | ||
36 | void addCollision(double axis, double lower, double upper, Direction dir, Collision::Type type); | 36 | void addCollision(double axis, double lower, double upper, Direction dir, Collision::Type type); |
37 | void processCollision(Game& game, Entity& collider, Collision collision, Direction dir, std::pair<double, double> old_position); | 37 | void processCollision(Game& game, Entity& collider, Collision collision, Direction dir, std::pair<double, double> old_position); |
38 | Collision::Type collisionFromMoveType(Map::MoveType type); | ||
38 | 39 | ||
39 | std::list<Collision> left_collisions; | 40 | std::list<Collision> left_collisions; |
40 | std::list<Collision> right_collisions; | 41 | std::list<Collision> right_collisions; |