diff options
| author | whiteshark0 <whiteshark0@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2007-06-07 07:42:38 +0000 |
|---|---|---|
| committer | whiteshark0 <whiteshark0@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2007-06-07 07:42:38 +0000 |
| commit | 18579e1d865dc0fbd9c179fc5d45b1fff2b9033b (patch) | |
| tree | 39ea0c3bccb12b22bc1b3d7b771bff6121cb37bb /Game | |
| parent | 7518565b2c77b915e8fe4f693f8de161d7506859 (diff) | |
| download | usdx-18579e1d865dc0fbd9c179fc5d45b1fff2b9033b.tar.gz usdx-18579e1d865dc0fbd9c179fc5d45b1fff2b9033b.tar.xz usdx-18579e1d865dc0fbd9c179fc5d45b1fff2b9033b.zip | |
Fixed 2 Bugs in Song Preview Fading
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@247 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'Game')
| -rw-r--r-- | Game/Code/Screens/UScreenSong.pas | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/Game/Code/Screens/UScreenSong.pas b/Game/Code/Screens/UScreenSong.pas index ee05c11c..1a5b41b8 100644 --- a/Game/Code/Screens/UScreenSong.pas +++ b/Game/Code/Screens/UScreenSong.pas @@ -1325,6 +1325,10 @@ begin If (Ini.PreviewVolume <> 100) or (Ini.PreviewFading <> 0) then
Music.SetMusicVolume(100);
+ //If Preview is deactivated: Load MUsicfile now
+ If (Ini.PreviewVolume = 0) then
+ Music.Open(CatSongs.Song[Interaction].Path + CatSongs.Song[Interaction].Mp3);
+
//When hide then Stop Music (For Party Mode Popup on Exit)
if (Display.NextScreen <> @ScreenSing) and (Display.NextScreen <> @ScreenSingModi) and (Music <> nil) then
Music.Stop;
@@ -1491,10 +1495,10 @@ begin if Music.Open(CatSongs.Song[Interaction].Path + CatSongs.Song[Interaction].Mp3) then begin
Music.MoveTo(Music.Length / 4);
//If Song Fading is activated then don't Play directly, and Set Volume to Null, else Play normal
- if (Ini.PreviewVolume <> 0) then
- Music.SetMusicVolume(0)
+ if (Ini.PreviewFading = 0) then
+ Music.Play
else
- Music.Play;
+ Music.SetMusicVolume(0);
end;
end
else
|