change how limited loop is set to be active

InventiveRhythm · Nov 2, 2024 · 1d015d7 · 1d015d7
1 parent 65a7491
commit 1d015d7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/fluXis.Game/Audio/GlobalClock.cs b/fluXis.Game/Audio/GlobalClock.cs
@@ -144,7 +144,7 @@ private void onMapChange(ValueChangedEvent<RealmMap> e)
     public void LoadMap(RealmMap info)
     {
         // reset stuff
-        AllowLimitedLoop = true;
+        AllowLimitedLoop = false;
         mapInfo = null;
 
         ChangeSource(info.GetTrack() ?? tracks.GetVirtual());

diff --git a/fluXis.Game/Screens/Multiplayer/SubScreens/Open/Lobby/MultiLobby.cs b/fluXis.Game/Screens/Multiplayer/SubScreens/Open/Lobby/MultiLobby.cs
@@ -274,7 +274,6 @@ private void onMapChange(APIMap map)
 
         clock.VolumeOut(); // because it sets itself to 1
         clock.RestartPoint = 0;
-        clock.AllowLimitedLoop = false;
         backgrounds.AddBackgroundFromMap(localMap);
         startClockMusic();
     }
@@ -382,7 +381,6 @@ public override void OnEntering(ScreenTransitionEvent e)
 
             clock.VolumeOut(); // because it sets itself to 1
             clock.RestartPoint = 0;
-            clock.AllowLimitedLoop = false;
             backgrounds.AddBackgroundFromMap(mapInfo);
             startClockMusic();
         }

diff --git a/fluXis.Game/Screens/Select/SelectScreen.cs b/fluXis.Game/Screens/Select/SelectScreen.cs
@@ -489,6 +489,7 @@ private void selectMap(RealmMap map)
         menuScroll.Play();
         backgrounds.AddBackgroundFromMap(map);
         lightController.FadeColour(FluXisColors.GetKeyColor(map.KeyCount), 400);
+        clock.AllowLimitedLoop = true;
 
         var item = Items.FirstOrDefault(i => i.Matches(map));
 
@@ -691,6 +692,7 @@ public override bool OnExiting(ScreenExitEvent e)
 
     private void playEnterAnimation()
     {
+        clock.AllowLimitedLoop = true;
         this.FadeOut();
 
         using (BeginDelayedSequence(ENTER_DELAY))
@@ -711,6 +713,7 @@ private void playEnterAnimation()
 
     private void playExitAnimation()
     {
+        clock.AllowLimitedLoop = false;
         this.FadeOut(FADE_DURATION);
 
         MapList.MoveToX(-100, MOVE_DURATION, Easing.OutQuint);