Merge remote-tracking branch 'voc/release-0.1' into release-0.1

This commit is contained in:
Florian Kuepper committed 2012-03-03 16:07:58 +01:00
commit d45043dfbd
1 file changed
+4 -16
+4 -16
View File
@@ -247,10 +247,7 @@ namespace Vocaluxe.Base
for (int p = 0; p < _NumPlayer; p++) for (int p = 0; p < _NumPlayer; p++)
{ {
CSound.AnalyzeBuffer(p);
if (CSound.RecordToneValid(p) || DEBUG_HIT)
{
for (int beat = _OldBeatD + 1; beat <= _CurrentBeatD; beat++) for (int beat = _OldBeatD + 1; beat <= _CurrentBeatD; beat++)
{ {
CLine[] lines = song.Notes.GetLines(_Player[p].LineNr).Line; CLine[] lines = song.Notes.GetLines(_Player[p].LineNr).Line;
@@ -283,24 +280,12 @@ namespace Vocaluxe.Base
{ {
if (beat >= notes[j].StartBeat && beat <= notes[j].EndBeat) if (beat >= notes[j].StartBeat && beat <= notes[j].EndBeat)
{ {
if (notes[j].PointsForBeat > 0)
Note = j; Note = j;
break; break;
} }
} }
if (Note >= 0) if (Note >= 0)
{
if (Line == lines.Length - 1)
{
if (Note == lines[Line].NoteCount - 1)
{
_Player[p].SongFinished = true;
}
}
}
if (Note >= 0 && notes[Note].PointsForBeat > 0)
{ {
_Player[p].CurrentNote = Note; _Player[p].CurrentNote = Note;
@@ -313,6 +298,9 @@ namespace Vocaluxe.Base
} }
} }
CSound.AnalyzeBuffer(p);
if (notes[Note].PointsForBeat > 0 && (CSound.RecordToneValid(p) || DEBUG_HIT))
{
int Tone = notes[Note].Tone; int Tone = notes[Note].Tone;
int TonePlayer = CSound.RecordGetTone(p); int TonePlayer = CSound.RecordGetTone(p);
@@ -383,8 +371,8 @@ namespace Vocaluxe.Base
} }
} }
} }
} }
} }
} }
_OldBeatD = _CurrentBeatD; _OldBeatD = _CurrentBeatD;