aboutsummaryrefslogtreecommitdiffstats
path: root/Game/Code
diff options
context:
space:
mode:
authorwhiteshark0 <whiteshark0@b956fd51-792f-4845-bead-9b4dfca2ff2c>2007-06-09 10:10:25 +0000
committerwhiteshark0 <whiteshark0@b956fd51-792f-4845-bead-9b4dfca2ff2c>2007-06-09 10:10:25 +0000
commit141878175d76d013be3ec8fb9fd0a58dc9b0d3eb (patch)
treecd8ff3b5a7b1a70d373d518acc351d606aecae14 /Game/Code
parent6130b0841429920015301a661e5133cfd1ed3cb3 (diff)
downloadusdx-141878175d76d013be3ec8fb9fd0a58dc9b0d3eb.tar.gz
usdx-141878175d76d013be3ec8fb9fd0a58dc9b0d3eb.tar.xz
usdx-141878175d76d013be3ec8fb9fd0a58dc9b0d3eb.zip
Added Preview Volume and Fading to Sound Options
Changed Themes to Fit these changes Updated Language Files Some fixes in SelectSlide git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@251 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'Game/Code')
-rw-r--r--Game/Code/Classes/UThemes.pas9
-rw-r--r--Game/Code/Menu/UMenuSelectSlide.pas10
-rw-r--r--Game/Code/Screens/UScreenOptionsSound.pas11
3 files changed, 22 insertions, 8 deletions
diff --git a/Game/Code/Classes/UThemes.pas b/Game/Code/Classes/UThemes.pas
index 8a6a7b9b..78875dec 100644
--- a/Game/Code/Classes/UThemes.pas
+++ b/Game/Code/Classes/UThemes.pas
@@ -446,7 +446,9 @@ type
SelectClickAssist: TThemeSelect;
SelectBeatClick: TThemeSelect;
SelectThreshold: TThemeSelect;
- //SelectTwoPlayerMode: TThemeSelect;
+ //Song Preview
+ SelectSlidePreviewVolume: TThemeSelectSlide;
+ SelectSlidePreviewFading: TThemeSelectSlide;
ButtonExit: TThemeButton;
end;
@@ -1209,7 +1211,10 @@ begin
ThemeLoadSelect(OptionsSound.SelectClickAssist, 'OptionsSoundSelectClickAssist');
ThemeLoadSelect(OptionsSound.SelectBeatClick, 'OptionsSoundSelectBeatClick');
ThemeLoadSelect(OptionsSound.SelectThreshold, 'OptionsSoundSelectThreshold');
- //ThemeLoadSelect(OptionsSound.SelectTwoPlayerMode, 'OptionsSoundSelectTwoPlayerMode');
+ //Song Preview
+ ThemeLoadSelectSlide(OptionsSound.SelectSlidePreviewVolume, 'OptionsSoundSelectSlidePreviewVolume');
+ ThemeLoadSelectSlide(OptionsSound.SelectSlidePreviewFading, 'OptionsSoundSelectSlidePreviewFading');
+
ThemeLoadButton(OptionsSound.ButtonExit, 'OptionsSoundButtonExit');
// Options Lyrics
diff --git a/Game/Code/Menu/UMenuSelectSlide.pas b/Game/Code/Menu/UMenuSelectSlide.pas
index f18b45cd..c1ccad6d 100644
--- a/Game/Code/Menu/UMenuSelectSlide.pas
+++ b/Game/Code/Menu/UMenuSelectSlide.pas
@@ -291,8 +291,8 @@ var
maxlength: Real;
I: Integer;
begin
- SetFontStyle(TextOpt[0].Style);
- SetFontSize(TextOpt[0].Size);
+ SetFontStyle(0{Text.Style});
+ SetFontSize(Text.Size);
maxlength := 0;
for I := low(TextOptT) to high (TextOptT) do
@@ -329,7 +329,11 @@ begin
//Generate Positions
//TextOpt[I].X := TextureSBG.X + 20 + (TextureSBG.W / Lines) * (I + 0.5);
- TextOpt[I].X := TextureSBG.X + 20 + (TextureSBG.W / Lines) * I;
+ if (I <> High(TextOpt)) OR (High(TextOpt) = 0) OR (Length(TextOptT) = Lines) then
+ TextOpt[I].X := TextureSBG.X + 20 + (TextureSBG.W / Lines) * I
+ else
+ TextOpt[I].X := TextureSBG.X + TextureSBG.W - maxlength;
+
TextOpt[I].Y := TextureSBG.Y + (TextureSBG.H / 2) - 1.5 * Text.Size{20};
//Better Look with 2 Options
diff --git a/Game/Code/Screens/UScreenOptionsSound.pas b/Game/Code/Screens/UScreenOptionsSound.pas
index c99f1ef6..fb04ab64 100644
--- a/Game/Code/Screens/UScreenOptionsSound.pas
+++ b/Game/Code/Screens/UScreenOptionsSound.pas
@@ -35,7 +35,7 @@ begin
end;
SDLK_RETURN:
begin
- if SelInteraction = 4 then begin
+ if SelInteraction = 6 then begin
Ini.Save;
Music.PlayBack;
FadeTo(@ScreenOptions);
@@ -47,14 +47,14 @@ begin
InteractPrev;
SDLK_RIGHT:
begin
- if (SelInteraction >= 0) and (SelInteraction <= 3) then begin
+ if (SelInteraction >= 0) and (SelInteraction <= 5) then begin
Music.PlayOption;
InteractInc;
end;
end;
SDLK_LEFT:
begin
- if (SelInteraction >= 0) and (SelInteraction <= 3) then begin
+ if (SelInteraction >= 0) and (SelInteraction <= 5) then begin
Music.PlayOption;
InteractDec;
end;
@@ -76,6 +76,11 @@ begin
AddSelect(Theme.OptionsSound.SelectBeatClick, Ini.BeatClick, IBeatClick);
AddSelect(Theme.OptionsSound.SelectThreshold, Ini.Threshold, IThreshold);
+ //Song Preview
+ AddSelectSlide(Theme.OptionsSound.SelectSlidePreviewVolume, Ini.PreviewVolume, IPreviewVolume);
+ AddSelectSlide
+ (Theme.OptionsSound.SelectSlidePreviewFading, Ini.PreviewFading, IPreviewFading);
+
AddButton(Theme.OptionsSound.ButtonExit);
if (Length(Button[0].Text)=0) then
AddButtonText(14, 20, Theme.Options.Description[7]);