4 files changed, 85 insertions, 0 deletions

@@ -51,12 +51,45 @@ public:
     animation_ = std::move(animation);
   }
 
+  inline bool isFlickering() const
+  {
+    return flickering_;
+  }
+
+  inline void setFlickering(bool v)
+  {
+    flickering_ = v;
+  }
+
+  inline size_t getFlickerTimer() const
+  {
+    return flickerTimer_;
+  }
+
+  inline void setFlickerTimer(size_t v)
+  {
+    flickerTimer_ = v;
+  }
+
+  inline bool isFrozen() const
+  {
+    return frozen_;
+  }
+
+  inline void setFrozen(bool v)
+  {
+    frozen_ = v;
+  }
+
 private:
 
   AnimationSet animationSet_;
   std::string animation_;
   size_t frame_ = 0;
   size_t countdown_ = 0;
+  bool flickering_ = false;
+  size_t flickerTimer_ = 0;
+  bool frozen_ = false;
 };
 
 #endif /* end of include guard: SPRITE_RENDERABLE_H_D3AACBBF */
@@ -2,14 +2,23 @@
 #define PLAYABLE_H_DDC566C3
 
 #include "component.h"
+#include <functional>
 
 class PlayableComponent : public Component {
 public:
 
+  using MapChangeCallback = std::function<void()>;
+
   bool changingMap = false;
   int newMapId = -1;
   double newMapX = 0;
   double newMapY = 0;
+  MapChangeCallback newMapCallback;
+
+  int checkpointMapId = -1;
+  double checkpointX = 0;
+  double checkpointY = 0;
+
 };
 
 #endif /* end of include guard: PLAYABLE_H_DDC566C3 */
@@ -70,6 +70,26 @@ public:
     grounded_ = v;
   }
 
+  inline bool isFrozen() const
+  {
+    return frozen_;
+  }
+
+  inline void setFrozen(bool v)
+  {
+    frozen_ = v;
+  }
+
+  inline bool isCollidable() const
+  {
+    return collidable_;
+  }
+
+  inline void setCollidable(bool v)
+  {
+    collidable_ = v;
+  }
+
 private:
 
   double velX_ = 0.0;
@@ -78,6 +98,8 @@ private:
   double accelY_ = 0.0;
   Type type_ = Type::vacuumed;
   bool grounded_ = false;
+  bool frozen_ = false;
+  bool collidable_ = true;
 };
 
 #endif /* end of include guard: TANGIBLE_H_746DB3EE */
@@ -0,0 +1,21 @@
+#ifndef SCHEDULABLE_H_1DA3FA2A
+#define SCHEDULABLE_H_1DA3FA2A
+
+#include "component.h"
+#include <tuple>
+#include <list>
+#include <functional>
+#include "entity_manager.h"
+
+class SchedulableComponent : public Component {
+public:
+
+  using id_type = EntityManager::id_type;
+
+  using Callback = std::function<void(id_type)>;
+  using Action = std::tuple<double, Callback>;
+
+  std::list<Action> actions;
+};
+
+#endif /* end of include guard: SCHEDULABLE_H_1DA3FA2A */