Setlist bug fixes

YARC-Official · Apr 19, 2023 · 96cf745 · 96cf745
1 parent fca3728
commit 96cf745
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/Assets/Script/PlayMode/Play.cs b/Assets/Script/PlayMode/Play.cs
@@ -331,10 +331,11 @@ public static void AddSongToSetlist(SongInfo song, float speed)
 
 		public static void StartSetlist()
         {
-			song = setlist[0];
+			// Song index gets incremented to 0 by ContinueSetlist().
+			setlistCurrentSongIndex = -1;
+
 			setlistSize = setlist.Count;
-			setlistCurrentSongIndex = 0;
-			GameManager.Instance.LoadScene(SceneIndex.PLAY);
+			ContinueSetlist();
 		}
 
 		public static void ContinueSetlist()
@@ -347,7 +348,6 @@ public static void ContinueSetlist()
 
 		public static void EndSetlist()
         {
-			Debug.Log("Setlist finished");
 			setlistSize = 0;
 			setlistCurrentSongIndex = 0;
 			setlist.Clear();

diff --git a/Assets/Script/UI/PostSong.cs b/Assets/Script/UI/PostSong.cs
@@ -116,7 +116,7 @@ private void OnDisable() {
 				player.inputStrategy.GenericNavigationEvent -= OnGenericNavigation;
 			}
 
-			if (Play.setlistCurrentSongIndex < Play.setlistSize)
+			if (Play.setlistCurrentSongIndex < Play.setlistSize - 1)
 			{
 				Play.ContinueSetlist();
 			} else