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

Fixed song name / updates to changes in CScreenSong.cs

Browse Source 
Fixed song name if Highscore was opened from song screen, but multiple rounds was played before.
Two further updates to the changes made to CScreenSong.cs.
This commit is contained in:
Stefan authored and GitHub committed 2020-01-25 08:22:32 +01:00
1 parent 72d279e525
commit 761d25d682
1 file changed
+3 -3
Download Patch File Download Diff File Expand all files Collapse all files
Vocaluxe/Screens/CScreenHighscore.cs
+3 -3
View File
@@ -243,7 +243,7 @@ namespace Vocaluxe.Screens
_FromScreenSong = true;
_Round = (int)EGameMode.TR_GAMEMODE_NORMAL;
_Scores = new List<SDBScoreEntry>[4];
int songID = CSongs.VisibleSongs[CScreenSong.getSelectedSongID()].ID;
int songID = CScreenSong.getSelectedSongID();
EHighscoreStyle style = CBase.Config.GetHighscoreStyle();
for (int gameModeNum = 0; gameModeNum < 4; gameModeNum++)
@@ -272,7 +272,7 @@ namespace Vocaluxe.Screens
CSong song;
if (_FromScreenSong)
song = CSongs.GetSong(CSongs.VisibleSongs[CScreenSong.getSelectedSongID()].ID);
song = CSongs.GetSong(CScreenSong.getSelectedSongID());
else
song = CGame.GetSong(_Round);
@@ -280,7 +280,7 @@ namespace Vocaluxe.Screens
return;
_Texts[_TextSongName].Text = song.Artist + " - " + song.Title;
if (points != null && points.NumRounds > 1)
if (points != null && !_FromScreenSong && points.NumRounds > 1)
_Texts[_TextSongName].Text += " (" + (_Round + 1) + "/" + points.NumRounds + ")";
switch ((_FromScreenSong ? (EGameMode)_Round : CGame.GetGameMode(_Round)))