Player movement/input is halted during cutscenes

7 files changed, 30 insertions, 2 deletions

@@ -25,6 +25,13 @@ CharacterState = {
   RUNNING = 3
 }
 
+function StartCutscene()
+  local playerId = getPlayerSprite()
+  local playerSprite = getSprite(playerId)
+  playerSprite.controllable = false
+  character():halt(playerId)
+end
+
 function DisplayMessage(msg, name, type)
   message():displayMessage(msg, name, type)
 end
@@ -38,6 +45,10 @@ end
 function HideCutsceneBars()
   WaitForEndOfMessage()
   message():hideCutsceneBars()
+
+  local playerId = getPlayerSprite()
+  local playerSprite = getSprite(playerId)
+  playerSprite.controllable = true
 end
 
 function SetAnimation(spriteName, animName)
@@ -1,5 +1,5 @@
 function default()
+  StartCutscene()
   DisplayMessage("No problem here.", "", SpeakerType.NONE)
-  WaitForEndOfMessage()
   HideCutsceneBars()
 end
@@ -1,4 +1,5 @@
 function script0001()
+  StartCutscene()
   SetAnimation("boney", "barking")
   local barkingNoise = LoopSound("barking_at_hallucination.wav")
 
@@ -1,4 +1,5 @@
 function test_trigger()
+  StartCutscene()
   PlaySound("boney_growl.wav")
   DisplayMessage("Hi! Welcome to the funky zone.", "", SpeakerType.NONE)
   WaitForEndOfMessage()
@@ -248,6 +248,18 @@ void CharacterSystem::stopRunningSound(Sprite& sprite) {
   }
 }
 
+void CharacterSystem::halt(int spriteId) {
+  // Because special stuff happens when we stop running, we have to handle the
+  // running case here.
+  Sprite& sprite = game_.getSprite(spriteId);
+  if (sprite.characterState == CharacterState::Running) {
+    stopRunning(spriteId);
+  } else {
+    // Other than that, it is simple to go to Still from Walking or Crouching.
+    setPartyState(spriteId, CharacterState::Still);
+  }
+}
+
 void CharacterSystem::clearSpriteCache() {
   for (Sprite& sprite : game_.getSprites() | game_.spriteView()) {
     if (sprite.runningSfxChannel != -1) {
@@ -33,6 +33,8 @@ public:
 
   void startRunning(int spriteId);
 
+  void halt(int spriteId);
+
   void clearSpriteCache() override;
 
 private:
@@ -31,7 +31,8 @@ ScriptSystem::ScriptSystem(Game& game) : game_(game) {
 
   engine_.new_usertype<CharacterSystem>(
     "character",
-    "startRunning", &CharacterSystem::startRunning);
+    "startRunning", &CharacterSystem::startRunning,
+    "halt", &CharacterSystem::halt);
 
   engine_.new_usertype<Mixer>(
     "mixer",