From 115255f6a3c2be422680710b5d6ba4226c3383a6 Mon Sep 17 00:00:00 2001
From: whiteshark0 <whiteshark0@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Tue, 15 Jun 2010 21:28:52 +0000
Subject: merged trunk r2528 into us_maker branch

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@2530 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 us_maker_edition/src/base/UNote.pas | 62 +++++++++++++++++++++++++++----------
 1 file changed, 45 insertions(+), 17 deletions(-)

(limited to 'us_maker_edition/src/base/UNote.pas')

diff --git a/us_maker_edition/src/base/UNote.pas b/us_maker_edition/src/base/UNote.pas
index 6eb99df9..d800d30e 100644
--- a/us_maker_edition/src/base/UNote.pas
+++ b/us_maker_edition/src/base/UNote.pas
@@ -88,12 +88,23 @@ type
     Note:           array of TPlayerNote;
   end;
 
+{* Player and music info *}
 var
-
-  // player and music info
-  Player:      array of TPlayer;
+  {**
+   * Player info and state for each player.
+   * The amount of players is given by PlayersPlay.
+   *}
+  Player: array of TPlayer;
+
+  {**
+   * Number of players or teams playing.
+   * Possible values: 1 - 6
+   *}
   PlayersPlay: integer;
 
+  {**
+   * Selected song for singing.
+   *}
   CurrentSong: TSong;
 
 const
@@ -340,8 +351,39 @@ begin
 end;
 
 procedure NewBeatDetect(Screen: TScreenSing);
+  var
+    SentenceEnd: integer;
+    I: cardinal;
 begin
   NewNote(Screen);
+
+  // check for sentence end
+  // we check all lines here because a new sentence may
+  // have been started even before the old one finishes
+  // due to corrupt lien breaks
+  // checking only current line works to, but may lead to
+  // weird ratings for the song files w/ the mentioned
+  // errors
+  // To-Do Philipp : check current and last line should
+  // do it for most corrupt txt and for lines in
+  // non-corrupt txts that start immediatly after the prev.
+  // line ends
+  if (assigned(Screen)) then
+  begin
+    for I := 0 to Lines[0].High do
+    begin
+      with Lines[0].Line[I] do
+      begin
+        if (HighNote > 0) then
+        begin
+          SentenceEnd := Note[HighNote].Start + Note[HighNote].Length;
+
+          if (LyricsState.OldBeatD < SentenceEnd) and (LyricsState.CurrentBeatD >= SentenceEnd) then
+            Screen.OnSentenceEnd(I);
+        end;
+      end;
+    end;
+  end;
 end;
 
 procedure NewNote(Screen: TScreenSing);
@@ -571,20 +613,6 @@ begin
   end; // for PlayerIndex
 
   //Log.LogStatus('EndBeat', 'NewBeat');
-
-  // on sentence end -> for LineBonus and display of SingBar (rating pop-up)
-  if (SentenceDetected >= Low(Lines[0].Line)) and
-     (SentenceDetected <= High(Lines[0].Line)) then
-  begin
-    Line := @Lines[0].Line[SentenceDetected];
-    CurrentLineFragment := @Line.Note[Line.HighNote];
-    if ((CurrentLineFragment.Start + CurrentLineFragment.Length - 1) = LyricsState.CurrentBeatD) then
-    begin
-      if assigned(Screen) then
-        Screen.OnSentenceEnd(SentenceDetected);
-    end;
-  end;
-
 end;
 
 end.
-- 
cgit v1.2.3