aboutsummaryrefslogtreecommitdiffstats
path: root/Game/Code/Screens/UScreenScore.pas
diff options
context:
space:
mode:
authorbrunzelchen <brunzelchen@b956fd51-792f-4845-bead-9b4dfca2ff2c>2010-02-21 17:02:16 +0000
committerbrunzelchen <brunzelchen@b956fd51-792f-4845-bead-9b4dfca2ff2c>2010-02-21 17:02:16 +0000
commit69b1910acc77c177dba95d7375a668c07648093a (patch)
treedf9c33e3fd671a4ceb5b0c62d377d1b368a9dabc /Game/Code/Screens/UScreenScore.pas
parent41e73f40aafbe9bf873f8fbdf46e092e58065341 (diff)
downloadusdx-69b1910acc77c177dba95d7375a668c07648093a.tar.gz
usdx-69b1910acc77c177dba95d7375a668c07648093a.tar.xz
usdx-69b1910acc77c177dba95d7375a668c07648093a.zip
added mp3 volume adjustment in songscreen and singscreen
fixed bug in singscreen (tab and pause) git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/1.0.1 Challenge MOD@2136 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to '')
-rw-r--r--Game/Code/Screens/UScreenScore.pas4
1 files changed, 2 insertions, 2 deletions
diff --git a/Game/Code/Screens/UScreenScore.pas b/Game/Code/Screens/UScreenScore.pas
index fca4a84a..ce26b448 100644
--- a/Game/Code/Screens/UScreenScore.pas
+++ b/Game/Code/Screens/UScreenScore.pas
@@ -529,11 +529,11 @@ begin
//If Song Fading is activated then don't Play directly, and Set Volume to Null, else Play normal
if (Ini.PreviewFading = 0) then
begin
- Music.SetMusicVolume (Ini.PreviewVolume * 10);
+ Music.SetMusicVolume (ScreenSong.MP3Volume);
Music.Play;
end else
begin
- Music.Fade(0, Ini.PreviewVolume*10, Ini.PreviewFading);
+ Music.Fade(0, ScreenSong.MP3Volume, Ini.PreviewFading);
Music.Play;
end;
end;