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

Remove unnecessary golden property

Browse Source
This commit is contained in:
Flamefire committed 2013-09-20 19:54:25 +02:00
1 parent 148aa0072d
commit 3fbc5994b1
3 files changed
+6 -8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Vocaluxe/Base/CDataBase.cs
+1 -1
View File
@@ -951,7 +951,7 @@ namespace Vocaluxe.Base
{ {
reader = command.ExecuteReader(); reader = command.ExecuteReader();
} }
catch (Exception e) catch (Exception)
{ {
return false; return false;
} }
Vocaluxe/Base/CGame.cs
+4 -4
View File
@@ -301,7 +301,7 @@ namespace Vocaluxe.Base
CSungNote lastNote = Players[p].SungLines[line].LastNote; CSungNote lastNote = Players[p].SungLines[line].LastNote;
if (notes[note].StartBeat == beat || lastNote.EndBeat + 1 != beat || lastNote.Tone != tone || !lastNote.Hit) if (notes[note].StartBeat == beat || lastNote.EndBeat + 1 != beat || lastNote.Tone != tone || !lastNote.Hit)
Players[p].SungLines[line].AddNote(new CSungNote(beat, 1, tone, notes[note], points, notes[note].NoteType == ENoteType.Golden)); Players[p].SungLines[line].AddNote(new CSungNote(beat, 1, tone, notes[note], points));
else else
{ {
Players[p].SungLines[line].IncLastNoteLength(); Players[p].SungLines[line].IncLastNoteLength();
@@ -309,7 +309,7 @@ namespace Vocaluxe.Base
} }
} }
else else
Players[p].SungLines[line].AddNote(new CSungNote(beat, 1, tone, notes[note], points, notes[note].NoteType == ENoteType.Golden)); Players[p].SungLines[line].AddNote(new CSungNote(beat, 1, tone, notes[note], points));
Players[p].SungLines[line].LastNote.CheckPerfect(); Players[p].SungLines[line].LastNote.CheckPerfect();
Players[p].SungLines[line].IsPerfect(lines[line]); Players[p].SungLines[line].IsPerfect(lines[line]);
@@ -384,7 +384,7 @@ namespace Vocaluxe.Base
{ {
if (note.StartBeat < nextStart) if (note.StartBeat < nextStart)
{ {
if (note.GoldenNote) if (note.Hit && note.HitNote.NoteType==ENoteType.Golden)
Players[p].PointsGoldenNotes += note.Points; Players[p].PointsGoldenNotes += note.Points;
Players[p].Points += note.Points; Players[p].Points += note.Points;
} }
@@ -394,7 +394,7 @@ namespace Vocaluxe.Base
} }
while (line.NoteCount > n && n >= 0) while (line.NoteCount > n && n >= 0)
{ {
if (line.Notes[n].GoldenNote) if (line.Notes[n].Hit && line.Notes[n].HitNote.NoteType == ENoteType.Golden)
Players[p].PointsGoldenNotes -= line.Notes[n].Points; Players[p].PointsGoldenNotes -= line.Notes[n].Points;
Players[p].Points -= line.Notes[n].Points; Players[p].Points -= line.Notes[n].Points;
line.DeleteNote(n); line.DeleteNote(n);
VocaluxeLib/Songs/CSungNote.cs
+1 -3
View File
@@ -41,16 +41,14 @@ namespace VocaluxeLib.Songs
/// <param name="duration"></param> /// <param name="duration"></param>
/// <param name="tone"></param> /// <param name="tone"></param>
/// <param name="hitNote"></param> /// <param name="hitNote"></param>
public CSungNote(int startBeat, int duration, int tone, CSongNote hitNote, double points, bool golden) : this(startBeat, duration, tone) public CSungNote(int startBeat, int duration, int tone, CSongNote hitNote, double points) : this(startBeat, duration, tone)
{ {
HitNote = hitNote; HitNote = hitNote;
Points = points; Points = points;
GoldenNote = golden;
} }
#region Properties #region Properties
public double Points; public double Points;
public bool GoldenNote;
// for drawing player notes // for drawing player notes
public bool Hit public bool Hit
{ {