diff options
| author | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2016-01-01 22:53:55 +0000 |
|---|---|---|
| committer | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2016-01-01 22:53:55 +0000 |
| commit | 9f1d6ca324242597369ac41c6f9fb29cb4aace1b (patch) | |
| tree | eb48d99b35888e3a0d043a5878280d42f34f512c /src/screens | |
| parent | 3544189cdf2cb38a3446ae968d9024406fcabe2a (diff) | |
| download | usdx-9f1d6ca324242597369ac41c6f9fb29cb4aace1b.tar.gz usdx-9f1d6ca324242597369ac41c6f9fb29cb4aace1b.tar.xz usdx-9f1d6ca324242597369ac41c6f9fb29cb4aace1b.zip | |
mainly change sentence-related stuff
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@3161 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'src/screens')
| -rw-r--r-- | src/screens/UScreenJukebox.pas | 8 | ||||
| -rw-r--r-- | src/screens/UScreenSing.pas | 14 |
2 files changed, 12 insertions, 10 deletions
diff --git a/src/screens/UScreenJukebox.pas b/src/screens/UScreenJukebox.pas index 36a65720..6296b4eb 100644 --- a/src/screens/UScreenJukebox.pas +++ b/src/screens/UScreenJukebox.pas @@ -198,8 +198,8 @@ type procedure Finish;
procedure Pause; // toggle pause
- procedure OnSentenceEnd(SentenceIndex: cardinal); // for linebonus + singbar
- procedure OnSentenceChange(SentenceIndex: cardinal); // for golden notes
+ procedure OnSentenceEnd(CP: integer; SentenceIndex: cardinal); // for linebonus + singbar
+ procedure OnSentenceChange(CP: integer; SentenceIndex: cardinal); // for golden notes
//procedure DeleteSong(Id: integer);
procedure FilterSongList(Filter: UTF8String);
@@ -1391,7 +1391,7 @@ begin end;
end;
-procedure TScreenJukebox.OnSentenceEnd(SentenceIndex: cardinal);
+procedure TScreenJukebox.OnSentenceEnd(CP: integer; SentenceIndex: cardinal);
var
PlayerIndex: byte;
CurrentPlayer: PPLayer;
@@ -1425,7 +1425,7 @@ end; // Called on sentence change
// SentenceIndex: index of the new active sentence
-procedure TScreenJukebox.OnSentenceChange(SentenceIndex: cardinal);
+procedure TScreenJukebox.OnSentenceChange(CP: integer; SentenceIndex: cardinal);
begin
// fill lyrics queue and set upper line to the current sentence
while (Lyrics.GetUpperLineIndex() < SentenceIndex) or
diff --git a/src/screens/UScreenSing.pas b/src/screens/UScreenSing.pas index 38c4762d..b339199b 100644 --- a/src/screens/UScreenSing.pas +++ b/src/screens/UScreenSing.pas @@ -163,8 +163,8 @@ type procedure Finish; virtual; procedure Pause; // toggle pause - procedure OnSentenceEnd(SentenceIndex: cardinal); // for linebonus + singbar - procedure OnSentenceChange(SentenceIndex: cardinal); // for golden notes + procedure OnSentenceEnd(CP: integer; SentenceIndex: cardinal); // for linebonus + singbar + procedure OnSentenceChange(CP: integer; SentenceIndex: cardinal); // for golden notes end; implementation @@ -949,7 +949,9 @@ begin end; // kill all stars not killed yet (goldenstarstwinkle mod) - GoldenRec.SentenceChange; + GoldenRec.SentenceChange(0); + if (PlayersPlay <> 1) then + GoldenRec.SentenceChange(1); // set position of line bonus - line bonus end // set number of empty sentences for line bonus @@ -1324,7 +1326,7 @@ begin end; end; -procedure TScreenSing.OnSentenceEnd(SentenceIndex: cardinal); +procedure TScreenSing.OnSentenceEnd(CP: integer; SentenceIndex: cardinal); var PlayerIndex: byte; CurrentPlayer: PPLayer; @@ -1420,10 +1422,10 @@ end; // Called on sentence change // SentenceIndex: index of the new active sentence -procedure TScreenSing.OnSentenceChange(SentenceIndex: cardinal); +procedure TScreenSing.OnSentenceChange(CP: integer; SentenceIndex: cardinal); begin // goldenstarstwinkle - GoldenRec.SentenceChange; + GoldenRec.SentenceChange(CP); // fill lyrics queue and set upper line to the current sentence while (Lyrics.GetUpperLineIndex() < SentenceIndex) or |