From 36d4e36d39834f95f293590cf11b28cd43f151e2 Mon Sep 17 00:00:00 2001 From: Alexander Eckart Date: Fri, 21 Dec 2012 12:56:37 +0100 Subject: [PATCH] fixed medley highscore adding --- Vocaluxe/Base/CGame.cs | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/Vocaluxe/Base/CGame.cs b/Vocaluxe/Base/CGame.cs index ce8a7827..1f65f207 100644 --- a/Vocaluxe/Base/CGame.cs +++ b/Vocaluxe/Base/CGame.cs @@ -267,6 +267,10 @@ namespace Vocaluxe.Base for (int beat = _OldBeatD + 1; beat <= _CurrentBeatD; beat++) { + if ((_GameMode.GetCurrentGameMode() == EGameMode.TR_GAMEMODE_MEDLEY && song.Medley.EndBeat == beat) || + (_GameMode.GetCurrentGameMode() == EGameMode.TR_GAMEMODE_SHORTSONG && song.ShortEnd == beat)) + _Player[p].SongFinished = true; + CLine[] lines = song.Notes.GetLines(_Player[p].LineNr).Line; int Line = -1; @@ -300,7 +304,7 @@ namespace Vocaluxe.Base Note = j; break; } - } + } if (Note >= 0) { @@ -310,17 +314,11 @@ namespace Vocaluxe.Base { if (Note == lines[Line].NoteCount - 1) { - if (notes[Note].EndBeat == beat - || (_GameMode.GetCurrentGameMode() == EGameMode.TR_GAMEMODE_MEDLEY && song.Medley.EndBeat == beat) - || (_GameMode.GetCurrentGameMode() == EGameMode.TR_GAMEMODE_SHORTSONG && song.ShortEnd == beat)) + if (notes[Note].EndBeat == beat) _Player[p].SongFinished = true; } } - if ((_GameMode.GetCurrentGameMode() == EGameMode.TR_GAMEMODE_MEDLEY && song.Medley.EndBeat == beat) || - (_GameMode.GetCurrentGameMode() == EGameMode.TR_GAMEMODE_SHORTSONG && song.ShortEnd == beat)) - _Player[p].SongFinished = true; - if (notes[Note].PointsForBeat > 0 && (CSound.RecordToneValid(p) || DEBUG_HIT)) { int Tone = notes[Note].Tone;