Projects/Vocaluxe
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix: Wrong lyric colors in duet mode (fix #361)

Browse Source
This commit is contained in:
Stefan authored and GitHub committed 2020-01-17 22:01:49 +01:00
1 parent d6b1e5359b
commit 0403d79e4e
1 file changed
+6 -6
Download Patch File Download Diff File Expand all files Collapse all files
Vocaluxe/Screens/CScreenSing.cs
+6 -6
View File
@@ -532,7 +532,7 @@ namespace Vocaluxe.Screens
_SingNotes[_SingBars].PlayerNotes[j].SetLine(nr); _SingNotes[_SingBars].PlayerNotes[j].SetLine(nr);
} }
if (i == 0 && !song.IsDuet || i == 1 && song.IsDuet) if (i == 0)
{ {
_Lyrics[_LyricMain].SetLine(lines[nr]); _Lyrics[_LyricMain].SetLine(lines[nr]);
_Lyrics[_LyricMainTop].SetLine(lines[nr]); _Lyrics[_LyricMainTop].SetLine(lines[nr]);
@@ -550,7 +550,7 @@ namespace Vocaluxe.Screens
_Lyrics[_LyricSubTop].Clear(); _Lyrics[_LyricSubTop].Clear();
} }
} }
if (i == 0 && song.IsDuet) if (i == 1 && song.IsDuet)
{ {
_Lyrics[_LyricMainDuet].SetLine(lines[nr]); _Lyrics[_LyricMainDuet].SetLine(lines[nr]);
_TimeToFirstNoteDuet = CGame.GetTimeFromBeats(lines[nr].FirstNoteBeat - lines[nr].StartBeat, song.BPM); _TimeToFirstNoteDuet = CGame.GetTimeFromBeats(lines[nr].FirstNoteBeat - lines[nr].StartBeat, song.BPM);
@@ -564,7 +564,7 @@ namespace Vocaluxe.Screens
} }
else else
{ {
if (i == 0 && !song.IsDuet || i == 1 && song.IsDuet) if (i == 0)
{ {
_Lyrics[_LyricMain].Clear(); _Lyrics[_LyricMain].Clear();
_Lyrics[_LyricSub].Clear(); _Lyrics[_LyricSub].Clear();
@@ -573,7 +573,7 @@ namespace Vocaluxe.Screens
_TimeToFirstNote = 0f; _TimeToFirstNote = 0f;
} }
if (i == 0 && song.IsDuet) if (i == 1 && song.IsDuet)
{ {
_Lyrics[_LyricMainDuet].Clear(); _Lyrics[_LyricMainDuet].Clear();
_Lyrics[_LyricSubDuet].Clear(); _Lyrics[_LyricSubDuet].Clear();
@@ -1199,8 +1199,8 @@ namespace Vocaluxe.Screens
if (CGame.GetSong() != null && CGame.GetSong().IsDuet) if (CGame.GetSong() != null && CGame.GetSong().IsDuet)
{ {
bottomLyricsVisible = true; bottomLyricsVisible = false;
topLyricsVisible = false; topLyricsVisible = true;
duetLyricsVisible = true; duetLyricsVisible = true;
} }