fixed medley highscore adding

This commit is contained in:
Alexander Eckart committed 2012-12-21 12:56:37 +01:00
1 parent edef3a8855
commit 36d4e36d39
1 file changed
+5 -7
+5 -7
View File
@@ -267,6 +267,10 @@ namespace Vocaluxe.Base
for (int beat = _OldBeatD + 1; beat <= _CurrentBeatD; beat++) 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; CLine[] lines = song.Notes.GetLines(_Player[p].LineNr).Line;
int Line = -1; int Line = -1;
@@ -310,17 +314,11 @@ namespace Vocaluxe.Base
{ {
if (Note == lines[Line].NoteCount - 1) if (Note == lines[Line].NoteCount - 1)
{ {
if (notes[Note].EndBeat == beat if (notes[Note].EndBeat == beat)
|| (_GameMode.GetCurrentGameMode() == EGameMode.TR_GAMEMODE_MEDLEY && song.Medley.EndBeat == beat)
|| (_GameMode.GetCurrentGameMode() == EGameMode.TR_GAMEMODE_SHORTSONG && song.ShortEnd == beat))
_Player[p].SongFinished = true; _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)) if (notes[Note].PointsForBeat > 0 && (CSound.RecordToneValid(p) || DEBUG_HIT))
{ {
int Tone = notes[Note].Tone; int Tone = notes[Note].Tone;