From 1541f0aa68478d0651c8ba2fccc181e75883e964 Mon Sep 17 00:00:00 2001
From: Jenny Crowe <jakobwcrowe@berkeley.edu>
Date: Fri, 15 Mar 2024 01:52:22 -0700
Subject: [PATCH] Camera tween pausing/unpausing additions

---
 assets                          |  2 +-
 source/funkin/play/PlayState.hx | 23 ++++++++++++++++-------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/assets b/assets
index 0e2c5bf21..223722892 160000
--- a/assets
+++ b/assets
@@ -1 +1 @@
-Subproject commit 0e2c5bf2134c7e517b70cf74afd58abe5c7b5e50
+Subproject commit 2237228923c6bd35df1e68e3b2a13dfffd1c243d
diff --git a/source/funkin/play/PlayState.hx b/source/funkin/play/PlayState.hx
index 7c0ed64b3..d6cb5bd47 100644
--- a/source/funkin/play/PlayState.hx
+++ b/source/funkin/play/PlayState.hx
@@ -412,7 +412,10 @@ class PlayState extends MusicBeatSubState
    */
   var musicPausedBySubState:Bool = false;
 
-  var cameraFollowTweenPausedBySubState:Bool = false; // Idea FOR LATER: Store paused tweens in an array, so we know which ones to unpause when leaving the Pause substate.
+  /**
+   * Track any camera tweens we've paused for a Pause substate, so we can unpause them when we return.
+   */
+  var cameraTweensPausedBySubState:List<FlxTween> = new List<FlxTween>();
 
   /**
    * False until `create()` has completed.
@@ -1145,11 +1148,17 @@ class PlayState extends MusicBeatSubState
         if (vocals != null) vocals.pause();
       }
 
-      // Pause camera tweening.
+      // Pause camera tweening, and keep track of which tweens we pause.
       if (cameraFollowTween != null && cameraFollowTween.active)
       {
         cameraFollowTween.active = false;
-        cameraFollowTweenPausedBySubState = true;
+        cameraTweensPausedBySubState.add(cameraFollowTween);
+      }
+
+      if (cameraZoomTween != null && cameraZoomTween.active)
+      {
+        cameraZoomTween.active = false;
+        cameraTweensPausedBySubState.add(cameraZoomTween);
       }
 
       // Pause the countdown.
@@ -1180,12 +1189,12 @@ class PlayState extends MusicBeatSubState
         musicPausedBySubState = false;
       }
 
-      // Resume camera tweening if we paused it.
-      if (cameraFollowTweenPausedBySubState)
+      // Resume camera tweens if we paused any.
+      for (camTween in cameraTweensPausedBySubState)
       {
-        cameraFollowTween.active = true;
-        cameraFollowTweenPausedBySubState = false;
+        camTween.active = true;
       }
+      cameraTweensPausedBySubState.clear();
 
       if (currentConversation != null)
       {