diff options
| author | brunzelchen <brunzelchen@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2009-12-09 19:29:14 +0000 |
|---|---|---|
| committer | brunzelchen <brunzelchen@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2009-12-09 19:29:14 +0000 |
| commit | 665d1f930ea1f543f6c7b3a2fe6609735e8effb1 (patch) | |
| tree | 24e6ddff02c4f28ea95ce022b1317b501075f659 /Medley/src/base/UDraw.pas | |
| parent | 5196a888b055b063868615d7d80cda3abdbb63b0 (diff) | |
| download | usdx-665d1f930ea1f543f6c7b3a2fe6609735e8effb1.tar.gz usdx-665d1f930ea1f543f6c7b3a2fe6609735e8effb1.tar.xz usdx-665d1f930ea1f543f6c7b3a2fe6609735e8effb1.zip | |
added medley code changes
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@2013 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'Medley/src/base/UDraw.pas')
| -rw-r--r-- | Medley/src/base/UDraw.pas | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Medley/src/base/UDraw.pas b/Medley/src/base/UDraw.pas index 1783986f..8bb2c210 100644 --- a/Medley/src/base/UDraw.pas +++ b/Medley/src/base/UDraw.pas @@ -97,6 +97,7 @@ uses URecord, UScreenSing, UScreenSingModi, + USong, UTexture; procedure SingDrawBackground; @@ -1387,7 +1388,13 @@ begin if (CurLyricsTime > 0) and (LyricsState.TotalTime > 0) then begin - LyricsProgress := CurLyricsTime / LyricsState.TotalTime; + if ScreenSong.Mode <> smMedley then + LyricsProgress := CurLyricsTime / LyricsState.TotalTime + else + LyricsProgress := (CurLyricsTime - GetTimeFromBeat(CurrentSong.Medley.StartBeat) + + CurrentSong.Medley.FadeIn_time) / (GetTimeFromBeat(CurrentSong.Medley.EndBeat) + + CurrentSong.Medley.FadeOut_time - GetTimeFromBeat(CurrentSong.Medley.StartBeat) + + CurrentSong.Medley.FadeIn_time); glTexCoord2f((width * LyricsProgress) / 8, 0); glVertex2f(x + width * LyricsProgress, y); |