1 files changed, 81 insertions, 4 deletions

@@ -7,13 +7,18 @@
 #include "components/orientable.h"
 #include "systems/mapping.h"
 #include "systems/pondering.h"
+#include "systems/orienting.h"
+#include "systems/scheduling.h"
+#include "systems/controlling.h"
 #include "animation.h"
+#include "muxer.h"
 
 void PlayingSystem::tick(double)
 {
   // Check if we need to change the map
   auto players = game_.getEntityManager().getEntitiesWithComponents<
-    PlayableComponent>();
+    PlayableComponent,
+    TransformableComponent>();
 
   for (id_type player : players)
   {
@@ -44,6 +49,12 @@ void PlayingSystem::tick(double)
 
       playable.changingMap = false;
 
+      if (playable.newMapCallback)
+      {
+        playable.newMapCallback();
+        playable.newMapCallback = nullptr;
+      }
+
       break;
     }
   }
@@ -66,7 +77,10 @@ void PlayingSystem::initPlayer()
 
   game_.getEntityManager().emplaceComponent<TransformableComponent>(
     player,
-    203, 44, 10, 12);
+    game_.getWorld().getStartingX(),
+    game_.getWorld().getStartingY(),
+    10,
+    12);
 
   game_.getSystemManager().getSystem<PonderingSystem>().initializeBody(
     player,
@@ -74,13 +88,20 @@ void PlayingSystem::initPlayer()
 
   game_.getEntityManager().emplaceComponent<ControllableComponent>(player);
   game_.getEntityManager().emplaceComponent<OrientableComponent>(player);
-  game_.getEntityManager().emplaceComponent<PlayableComponent>(player);
+
+  auto& playable = game_.getEntityManager().
+    emplaceComponent<PlayableComponent>(player);
+
+  playable.checkpointMapId = game_.getWorld().getStartingMapId();
+  playable.checkpointX = game_.getWorld().getStartingX();
+  playable.checkpointY = game_.getWorld().getStartingY();
 }
 
 void PlayingSystem::changeMap(
   size_t mapId,
   double x,
-  double y)
+  double y,
+  PlayableComponent::MapChangeCallback callback)
 {
   auto players = game_.getEntityManager().getEntitiesWithComponents<
     PlayableComponent>();
@@ -94,5 +115,61 @@ void PlayingSystem::changeMap(
     playable.newMapId = mapId;
     playable.newMapX = x;
     playable.newMapY = y;
+    playable.newMapCallback = std::move(callback);
+  }
+}
+
+void PlayingSystem::die()
+{
+  playSound("res/Hit_Hurt5.wav", 0.25);
+
+  auto players = game_.getEntityManager().getEntitiesWithComponents<
+    OrientableComponent,
+    ControllableComponent,
+    AnimatableComponent,
+    PonderableComponent,
+    PlayableComponent>();
+
+  for (id_type player : players)
+  {
+    auto& animatable = game_.getEntityManager().
+      getComponent<AnimatableComponent>(player);
+
+    auto& ponderable = game_.getEntityManager().
+      getComponent<PonderableComponent>(player);
+
+    auto& controlling = game_.getSystemManager().getSystem<ControllingSystem>();
+    controlling.freeze(player);
+
+    animatable.setFrozen(true);
+    animatable.setFlickering(true);
+    ponderable.setFrozen(true);
+    ponderable.setCollidable(false);
+
+    auto& scheduling = game_.getSystemManager().getSystem<SchedulingSystem>();
+
+    scheduling.schedule(player, 0.75, [&] (id_type player) {
+      auto& playable = game_.getEntityManager().
+        getComponent<PlayableComponent>(player);
+
+      changeMap(
+        playable.checkpointMapId,
+        playable.checkpointX,
+        playable.checkpointY,
+        [&, player] () {
+          animatable.setFrozen(false);
+          animatable.setFlickering(false);
+          ponderable.setFrozen(false);
+          ponderable.setCollidable(true);
+
+          // Reset the walk state, and then potentially let the
+          // ControllingSystem set it again.
+          auto& orienting = game_.getSystemManager().
+            getSystem<OrientingSystem>();
+          orienting.stopWalking(player);
+
+          controlling.unfreeze(player);
+        });
+    });
   }
 }