From 665d1f930ea1f543f6c7b3a2fe6609735e8effb1 Mon Sep 17 00:00:00 2001
From: brunzelchen <brunzelchen@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Wed, 9 Dec 2009 19:29:14 +0000
Subject: added medley code changes

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@2013 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 Medley/src/base/UDraw.pas | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'Medley/src/base/UDraw.pas')

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);
 
-- 
cgit v1.2.3