Count perfect lines instead of line perfection score

This should reduce floating point arithmetic errors. Fixes #844
UltraStar-Deluxe · Oct 4, 2024 · da72b79 · da72b79
1 parent d816e69
commit da72b79
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/src/base/UNote.pas b/src/base/UNote.pas
@@ -71,7 +71,7 @@   TPlayer = record
 
     // Scores
     Score:          real;
-    ScoreLine:      real;
+    PerfectLines: real;
     ScoreGolden:    real;
 
     ScoreInt:       integer;

diff --git a/src/screens/controllers/UScreenSingController.pas b/src/screens/controllers/UScreenSingController.pas
@@ -256,7 +256,7 @@ function TScreenSingController.ParseInput(PressedKey: Cardinal; CharCode: UCS4Ch
         with Player[i1] do
         begin
           Score          := 0;
-          ScoreLine      := 0;
+          PerfectLines   := 0;
           ScoreGolden    := 0;
 
           ScoreInt       := 0;
@@ -556,7 +556,7 @@ function TScreenSingController.ParseInput(PressedKey: Cardinal; CharCode: UCS4Ch
         with Player[i1] do
         begin
           Score          := 0;
-          ScoreLine      := 0;
+          PerfectLines   := 0;
           ScoreGolden    := 0;
 
           ScoreInt       := 0;
@@ -838,7 +838,7 @@ procedure TScreenSingController.onShowFinish;
     with Player[PlayerIndex] do
     begin
       Score          := 0;
-      ScoreLine      := 0;
+      PerfectLines   := 0;
       ScoreGolden    := 0;
 
       ScoreInt       := 0;
@@ -1568,9 +1568,9 @@ procedure TScreenSingController.Finish;
               PlaylistMedley.Stats[len].Player[I].Score +
               PlaylistMedley.Stats[J].Player[I].Score;
 
-            PlaylistMedley.Stats[len].Player[I].ScoreLine :=
-              PlaylistMedley.Stats[len].Player[I].ScoreLine +
-              PlaylistMedley.Stats[J].Player[I].ScoreLine;
+            PlaylistMedley.Stats[len].Player[I].PerfectLines :=
+              PlaylistMedley.Stats[len].Player[I].PerfectLines +
+              PlaylistMedley.Stats[J].Player[I].PerfectLines;
 
             PlaylistMedley.Stats[len].Player[I].ScoreGolden :=
               PlaylistMedley.Stats[len].Player[I].ScoreGolden +
@@ -1600,8 +1600,8 @@ procedure TScreenSingController.Finish;
           PlaylistMedley.Stats[len].Player[I].Score := round(
             PlaylistMedley.Stats[len].Player[I].Score / len);
 
-          PlaylistMedley.Stats[len].Player[I].ScoreLine := round(
-            PlaylistMedley.Stats[len].Player[I].ScoreLine / len);
+          PlaylistMedley.Stats[len].Player[I].PerfectLines := round(
+            PlaylistMedley.Stats[len].Player[I].PerfectLines / len);
 
           PlaylistMedley.Stats[len].Player[I].ScoreGolden := round(
             PlaylistMedley.Stats[len].Player[I].ScoreGolden / len);
@@ -1710,9 +1710,9 @@ procedure TScreenSingController.OnSentenceEnd(Track: integer; SentenceIndex: car
         LineBonus := MAX_SONG_LINE_BONUS / (Length(Tracks[Track].Lines) -
           NumEmptySentences[Track]);
         // apply line-bonus
-        CurrentPlayer.ScoreLine :=
-          CurrentPlayer.ScoreLine + LineBonus * LinePerfection;
-        CurrentPlayer.ScoreLineInt := Floor(CurrentPlayer.ScoreLine / 10) * 10;
+        CurrentPlayer.PerfectLines :=
+          CurrentPlayer.PerfectLines + LinePerfection;
+        CurrentPlayer.ScoreLineInt := Floor(CurrentPlayer.PerfectLines * LineBonus / 10) * 10;
         // update total score
         CurrentPlayer.ScoreTotalInt :=
           CurrentPlayer.ScoreInt +