summary refs log tree commit diff stats
path: root/src/components/map_collision.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/components/map_collision.h')
-rw-r--r--src/components/map_collision.h3
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
7class Map;
8class Game; 8class Game;
9 9
10class MapCollisionComponent : public Component { 10class 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;