2 files changed, 18 insertions, 2 deletions

@@ -7,7 +7,7 @@
 #include <list>
 #include "component.h"
 #include "renderer/texture.h"
-#include "collision.h"
+#include "components/ponderable.h"
 #include "entity_manager.h"
 
 class MappableComponent : public Component {
@@ -46,7 +46,7 @@ public:
   class Boundary {
   public:
 
-    using Type = Collision::Type;
+    using Type = PonderableComponent::Collision;
 
     Boundary(
       double axis,
@@ -21,6 +21,17 @@ public:
   };
 
   /**
+   * List of different types of collidable surfaces.
+   */
+  enum class Collision {
+    wall,
+    platform,
+    adjacency,
+    warp,
+    danger
+  };
+
+  /**
    * Constructor for initializing the body type, which is a constant.
    */
   PonderableComponent(Type type) : type(type)
@@ -67,6 +78,11 @@ public:
   bool collidable = true;
 
   /**
+   * The effect that colliding with this body has.
+   */
+  Collision colliderType = Collision::wall;
+
+  /**
    * If this flag is disabled, the entity will be ignored by the pondering
    * system.
    *