From 2ec163612042bfa5e4e1bf220b489506f7039677 Mon Sep 17 00:00:00 2001
From: Kelly Rauchenberger <fefferburbia@gmail.com>
Date: Wed, 18 Mar 2015 09:48:43 -0400
Subject: Game can now read map file from map editor (also added new map)

---
 src/components/map_collision.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/components/map_collision.h')

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 @@
 #define MAP_COLLISION_H
 
 #include "entity.h"
+#include "map.h"
 #include <list>
 
-class Map;
 class Game;
 
 class MapCollisionComponent : public Component {
@@ -35,6 +35,7 @@ class MapCollisionComponent : public Component {
     
     void addCollision(double axis, double lower, double upper, Direction dir, Collision::Type type);
     void processCollision(Game& game, Entity& collider, Collision collision, Direction dir, std::pair<double, double> old_position);
+    Collision::Type collisionFromMoveType(Map::MoveType type);
     
     std::list<Collision> left_collisions;
     std::list<Collision> right_collisions;
-- 
cgit 1.4.1