fixed the bug syncing in every frame when legacy vocal is null

HRK-EXEX · Jan 6, 2025 · 6588b51 · 6588b51
1 parent fa40078
commit 6588b51
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/source/backend/CoolUtil.hx b/source/backend/CoolUtil.hx
@@ -217,7 +217,9 @@ class CoolUtil
 			} else {
 				// Larger than 1
 				if (str.length == prec) result = str;
-				else result = str.substr(0, str.length-prec) + (prec > 0 ? '.'+str.substr(str.length-prec) : '');
+				else {
+					result = str.substr(0, str.length-prec) + (prec > 0 ? '.'+str.substr(str.length-prec) : '');
+				}
 			}
 		} else {
 			str = ''+Math.fround(

diff --git a/source/states/PlayState.hx b/source/states/PlayState.hx
@@ -1680,6 +1680,7 @@ class PlayState extends MusicBeatState
 		gfSide = !songData.isOldVersion;
 
 		curSong = songData.song;
+		bfVocal = opVocal = false;
 
 		vocals = opponentVocals = null;
 		try
@@ -1691,8 +1692,10 @@ class PlayState extends MusicBeatState
 				{
 					var playerVocals = Paths.voices(songData.song,
 						(boyfriend.vocalsFile == null || boyfriend.vocalsFile.length < 1) ? 'Player' : boyfriend.vocalsFile);
-					vocals = new FlxSound().loadEmbedded(playerVocals);
-					bfVocal = true;
+					if (playerVocals != null && playerVocals.length > 0) {
+						vocals = new FlxSound().loadEmbedded(playerVocals);
+						bfVocal = true;
+					}
 
 					var oppVocals = Paths.voices(songData.song, (dad.vocalsFile == null || dad.vocalsFile.length < 1) ? 'Opponent' : dad.vocalsFile);
 					if (oppVocals != null && oppVocals.length > 0) {
@@ -1701,9 +1704,9 @@ class PlayState extends MusicBeatState
 					}
 				} else {
 					vocals = new FlxSound().loadEmbedded(legacyVoices);
-					bfVocal = true;
+					bfVocal = vocals != null;
 				}
-			}
+			} 
 		} catch (e:Dynamic) {}
 
 		#if FLX_PITCH