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

Easier sing-note adding

Browse Source
This commit is contained in:
Flamefire committed 2013-02-23 18:12:23 +01:00
1 parent dfe73d6dea
commit 42ff24cbf2
1 file changed
+8 -12
Download Patch File Download Diff File Expand all files Collapse all files
Vocaluxe/Base/CGame.cs
+8 -12
View File
@@ -304,7 +304,8 @@ namespace Vocaluxe.Base
TonePlayer = Tone; TonePlayer = Tone;
_Player[p].NoteDiff = Math.Abs(Tone - TonePlayer); _Player[p].NoteDiff = Math.Abs(Tone - TonePlayer);
if (_Player[p].NoteDiff <= (2 - (int)_Player[p].Difficulty)) bool Hit=_Player[p].NoteDiff <= (2 - (int)_Player[p].Difficulty);
if (Hit)
{ {
// valid // valid
//CSound.RecordSetTone(p, Tone); //CSound.RecordSetTone(p, Tone);
@@ -318,7 +319,7 @@ namespace Vocaluxe.Base
if (_Player[p].SingLine[Line].NoteCount > 0) if (_Player[p].SingLine[Line].NoteCount > 0)
{ {
CNote nt = _Player[p].SingLine[Line].LastNote; CNote nt = _Player[p].SingLine[Line].LastNote;
if (notes[Note].StartBeat == beat || nt.EndBeat + 1 != beat || nt.Tone != Tone) if (notes[Note].StartBeat == beat || nt.EndBeat + 1 != beat || nt.Tone != Tone || !nt.Hit)
_Player[p].SingLine[Line].AddNote(new CNote(beat, 1, Tone, String.Empty, true, notes[Note].NoteType)); _Player[p].SingLine[Line].AddNote(new CNote(beat, 1, Tone, String.Empty, true, notes[Note].NoteType));
else else
{ {
@@ -338,18 +339,13 @@ namespace Vocaluxe.Base
if (_Player[p].SingLine[Line].NoteCount > 0) if (_Player[p].SingLine[Line].NoteCount > 0)
{ {
CNote nt = _Player[p].SingLine[Line].LastNote; CNote nt = _Player[p].SingLine[Line].LastNote;
if (nt.EndBeat + 1 != beat || nt.Hit) if (nt.Tone == TonePlayer && nt.EndBeat + 1 == beat && !nt.Hit)
_Player[p].SingLine[Line].AddNote(new CNote(beat, 1, TonePlayer, String.Empty, false, ENoteType.Freestyle)); {
_Player[p].SingLine[Line].IncLastNoteLength();
}
else else
{ {
if (nt.Tone == TonePlayer && nt.EndBeat + 1 == beat) _Player[p].SingLine[Line].AddNote(new CNote(beat, 1, TonePlayer, String.Empty, false, ENoteType.Freestyle));
{
_Player[p].SingLine[Line].IncLastNoteLength();
}
else
{
_Player[p].SingLine[Line].AddNote(new CNote(beat, 1, TonePlayer, String.Empty, false, ENoteType.Freestyle));
}
} }
} }
else else