Running is preserved across screen transitions

4 files changed, 45 insertions, 13 deletions

@@ -18,6 +18,13 @@ Direction = {
   UP_LEFT = 7
 }
 
+CharacterState = {
+  STILL = 0,
+  WALKING = 1,
+  CROUCHING = 2,
+  RUNNING = 3
+}
+
 function DisplayMessage(msg, name, type)
   message():displayMessage(msg, name, type)
 end
@@ -82,12 +89,18 @@ function ChangeMap(map, warp)
   local playerId = getControllableSprite()
   local playerSprite = getSprite(playerId)
   local direction = playerSprite.dir
+  local oldState = playerSprite.characterState
 
   FadeToBlack(150)
   loadMap("../res/maps/" .. map .. ".tmx", warp)
 
   local newPlayerId = getControllableSprite()
   SetPartyDirection(newPlayerId, direction)
+
+  if oldState == CharacterState.RUNNING then
+    character():startRunning(newPlayerId)
+  end
+
   coroutine.yield()
   RemoveFadeout(150)
 end
@@ -156,21 +156,26 @@ void CharacterSystem::endCrouch(int spriteId) {
   Sprite& sprite = game_.getSprite(spriteId);
 
   if (sprite.characterState == CharacterState::Crouching) {
-    setPartyState(spriteId, CharacterState::Running);
+    startRunning(spriteId);
+  }
+}
 
-    for (int followerId : sprite.followers) {
-      // Halve the movement buffer for the followers.
-      Sprite& follower = game_.getSprite(followerId);
-      std::deque<Movement> newMove;
-
-      while (!follower.trail.empty()) {
-        newMove.push_back(follower.trail.front());
-        follower.trail.pop_front();
-        follower.trail.pop_front();
-      }
+void CharacterSystem::startRunning(int spriteId) {
+  Sprite& sprite = game_.getSprite(spriteId);
+  setPartyState(spriteId, CharacterState::Running);
+
+  for (int followerId : sprite.followers) {
+    // Halve the movement buffer for the followers.
+    Sprite& follower = game_.getSprite(followerId);
+    std::deque<Movement> newMove;
 
-      follower.trail = std::move(newMove);
+    while (!follower.trail.empty()) {
+      newMove.push_back(follower.trail.front());
+      follower.trail.pop_front();
+      follower.trail.pop_front();
     }
+
+    follower.trail = std::move(newMove);
   }
 }
 
@@ -31,6 +31,8 @@ public:
 
   void endCrouch(int spriteId);
 
+  void startRunning(int spriteId);
+
   void clearSpriteCache() override;
 
 private:
@@ -3,6 +3,7 @@
 #include "game.h"
 #include "message_system.h"
 #include "animation_system.h"
+#include "character_system.h"
 
 ScriptSystem::ScriptSystem(Game& game) : game_(game) {
   engine_.open_libraries(
@@ -13,7 +14,8 @@ ScriptSystem::ScriptSystem(Game& game) : game_(game) {
   engine_.new_usertype<Sprite>(
     "sprite",
     "dir", &Sprite::dir,
-    "followers", &Sprite::followers);
+    "followers", &Sprite::followers,
+    "characterState", &Sprite::characterState);
 
   engine_.new_usertype<MessageSystem>(
     "message",
@@ -26,6 +28,10 @@ ScriptSystem::ScriptSystem(Game& game) : game_(game) {
     "setSpriteAnimation", &AnimationSystem::setSpriteAnimation,
     "setSpriteDirection", &AnimationSystem::setSpriteDirection);
 
+  engine_.new_usertype<CharacterSystem>(
+    "character",
+    "startRunning", &CharacterSystem::startRunning);
+
   engine_.new_usertype<Mixer>(
     "mixer",
     "playSound", &Mixer::playSound,
@@ -45,6 +51,12 @@ ScriptSystem::ScriptSystem(Game& game) : game_(game) {
     });
 
   engine_.set_function(
+    "character",
+    [&] () -> CharacterSystem& {
+      return game_.getSystem<CharacterSystem>();
+    });
+
+  engine_.set_function(
     "mixer",
     [&] () -> Mixer& {
       return game_.getMixer();