Fix overlapping notes

More consistent CLyric
Some renaming for clearer meaning
This commit is contained in:
Flamefire committed 2013-10-11 14:50:27 +02:00
1 parent bf1c00b5d1
commit 55d5c61a66
11 files changed
+177 -201

No files matched your search

+3 -3
View File
@@ -290,7 +290,7 @@ namespace Vocaluxe.Base
//CSound.RecordSetTone(p, Tone);
double points = (CSettings.MaxScore - CSettings.LinebonusScore) * (double)notes[note].PointsForBeat /
song.Notes.GetVoice(Players[p].VoiceNr).Points;
if (notes[note].NoteType == ENoteType.Golden)
if (notes[note].Type == ENoteType.Golden)
Players[p].PointsGoldenNotes += points;
Players[p].Points += points;
@@ -384,7 +384,7 @@ namespace Vocaluxe.Base
{
if (note.StartBeat < nextStart)
{
if (note.Hit && note.HitNote.NoteType==ENoteType.Golden)
if (note.Hit && note.HitNote.Type == ENoteType.Golden)
Players[p].PointsGoldenNotes += note.Points;
Players[p].Points += note.Points;
}
@@ -394,7 +394,7 @@ namespace Vocaluxe.Base
}
while (line.NoteCount > n && n >= 0)
{
if (line.Notes[n].Hit && line.Notes[n].HitNote.NoteType == ENoteType.Golden)
if (line.Notes[n].Hit && line.Notes[n].HitNote.Type == ENoteType.Golden)
Players[p].PointsGoldenNotes -= line.Notes[n].Points;
Players[p].Points -= line.Notes[n].Points;
line.DeleteNote(n);