3 files changed, 47 insertions, 5 deletions

@@ -125,6 +125,11 @@ public:
     font_ = std::move(v);
   }
 
+  inline std::map<size_t, id_type>& getInstances()
+  {
+    return instances_;
+  }
+
 private:
 
   size_t mapId_ = -1;
@@ -135,6 +140,7 @@ private:
   asc_boundaries_type downBoundaries_;
   Texture tileset_;
   Texture font_;
+  std::map<size_t, id_type> instances_;
 };
 
 #endif /* end of include guard: MAPPABLE_H_0B0316FB */
@@ -18,6 +18,8 @@ public:
   int checkpointMapId = -1;
   double checkpointX = 0;
   double checkpointY = 0;
+  bool checkpointObjectActivated = false;
+  size_t checkpointObjectIndex = 0;
 
 };
 
@@ -2,22 +2,44 @@
 #define TANGIBLE_H_746DB3EE
 
 #include "component.h"
+#include <functional>
+#include <array>
+
+class Game;
 
 class PonderableComponent : public Component {
 public:
 
-  enum class Type {
+  enum class BodyType {
     vacuumed,
     freefalling
   };
 
-  PonderableComponent(Type type) : type_(type)
+  enum class ColliderType {
+    player,
+    event
+  };
+
+  static const size_t COLLIDER_TYPES = 2;
+
+  PonderableComponent(
+    BodyType bodyType,
+    ColliderType colliderType) :
+      bodyType_(bodyType),
+      colliderType_(colliderType)
+  {
+  }
+
+  using event_callback_type = std::function<void(Game& game)>;
+
+  inline BodyType getBodyType() const
   {
+    return bodyType_;
   }
 
-  inline Type getType() const
+  inline ColliderType getColliderType() const
   {
-    return type_;
+    return colliderType_;
   }
 
   inline double getVelocityX() const
@@ -90,16 +112,28 @@ public:
     collidable_ = v;
   }
 
+  inline const event_callback_type& getEventCallback(ColliderType v) const
+  {
+    return eventCallbacks_[static_cast<size_t>(v)];
+  }
+
+  inline void setEventCallback(ColliderType v, event_callback_type callback)
+  {
+    eventCallbacks_[static_cast<size_t>(v)] = std::move(callback);
+  }
+
 private:
 
   double velX_ = 0.0;
   double velY_ = 0.0;
   double accelX_ = 0.0;
   double accelY_ = 0.0;
-  Type type_ = Type::vacuumed;
+  BodyType bodyType_;
+  ColliderType colliderType_;
   bool grounded_ = false;
   bool frozen_ = false;
   bool collidable_ = true;
+  std::array<event_callback_type, COLLIDER_TYPES> eventCallbacks_;
 };
 
 #endif /* end of include guard: TANGIBLE_H_746DB3EE */