From 8121a296beadb6117aa51353c642aab92cf19151 Mon Sep 17 00:00:00 2001 From: mogguh Date: Sat, 12 Jul 2008 03:23:24 +0000 Subject: Text has a new property -> Z (default is 0) Selects on the options have been exchanged for SelectSlides (OptionsScreens are looking less broken (more to come)) Solmization has been banned from the options (it's still available via config.ini and is working) Uncommented poc ttf code [Back] button in OptionsRecord is skineable again git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1183 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/Screens/UScreenOptionsAdvanced.pas | 13 +++++++------ Game/Code/Screens/UScreenOptionsGame.pas | 16 +++++++--------- Game/Code/Screens/UScreenOptionsGraphics.pas | 13 +++++++------ Game/Code/Screens/UScreenOptionsLyrics.pas | 11 ++++++----- Game/Code/Screens/UScreenOptionsRecord.pas | 15 +++++++++------ Game/Code/Screens/UScreenOptionsSound.pas | 11 ++++++----- Game/Code/Screens/UScreenOptionsThemes.pas | 7 +------ 7 files changed, 43 insertions(+), 43 deletions(-) (limited to 'Game/Code/Screens') diff --git a/Game/Code/Screens/UScreenOptionsAdvanced.pas b/Game/Code/Screens/UScreenOptionsAdvanced.pas index adf4125d..711414aa 100644 --- a/Game/Code/Screens/UScreenOptionsAdvanced.pas +++ b/Game/Code/Screens/UScreenOptionsAdvanced.pas @@ -38,7 +38,8 @@ begin SDLK_ESCAPE, SDLK_BACKSPACE : begin - Ini.Save; + // Escape -> save nothing - just leave this screen + AudioPlayback.PlaySound(SoundLib.Back); FadeTo(@ScreenOptions); end; @@ -88,12 +89,12 @@ begin //SelectLoadAnimation Hidden because it is useless atm //AddSelect(Theme.OptionsAdvanced.SelectLoadAnimation, Ini.LoadAnimation, ILoadAnimation); - AddSelect(Theme.OptionsAdvanced.SelectScreenFade, Ini.ScreenFade, IScreenFade); - AddSelect(Theme.OptionsAdvanced.SelectEffectSing, Ini.EffectSing, IEffectSing); - AddSelect(Theme.OptionsAdvanced.SelectLineBonus, Ini.LineBonus, ILineBonus); + AddSelectSlide(Theme.OptionsAdvanced.SelectScreenFade, Ini.ScreenFade, IScreenFade); + AddSelectSlide(Theme.OptionsAdvanced.SelectEffectSing, Ini.EffectSing, IEffectSing); + AddSelectSlide(Theme.OptionsAdvanced.SelectLineBonus, Ini.LineBonus, ILineBonus); AddSelectSlide(Theme.OptionsAdvanced.SelectOnSongClick, Ini.OnSongClick, IOnSongClick); - AddSelect(Theme.OptionsAdvanced.SelectAskbeforeDel, Ini.AskbeforeDel, IAskbeforeDel); - AddSelect(Theme.OptionsAdvanced.SelectPartyPopup, Ini.PartyPopup, IPartyPopup); + AddSelectSlide(Theme.OptionsAdvanced.SelectAskbeforeDel, Ini.AskbeforeDel, IAskbeforeDel); + AddSelectSlide(Theme.OptionsAdvanced.SelectPartyPopup, Ini.PartyPopup, IPartyPopup); AddButton(Theme.OptionsAdvanced.ButtonExit); if (Length(Button[0].Text)=0) then diff --git a/Game/Code/Screens/UScreenOptionsGame.pas b/Game/Code/Screens/UScreenOptionsGame.pas index 428b2ff7..2dc8dd7f 100644 --- a/Game/Code/Screens/UScreenOptionsGame.pas +++ b/Game/Code/Screens/UScreenOptionsGame.pas @@ -42,6 +42,7 @@ begin begin AudioPlayback.PlaySound(SoundLib.Back); RefreshSongs; + FadeTo(@ScreenOptions); end; SDLK_RETURN: @@ -77,8 +78,6 @@ begin end; constructor TScreenOptionsGame.Create; -//var -// I: integer; // Auto Removed, Unused Variable begin inherited Create; @@ -88,13 +87,12 @@ begin old_Sorting := Ini.Sorting; old_Tabs := Ini.Tabs; - AddSelect(Theme.OptionsGame.SelectPlayers, Ini.Players, IPlayers); - AddSelect(Theme.OptionsGame.SelectDifficulty, Ini.Difficulty, IDifficulty); - AddSelectSlide(Theme.OptionsGame.SelectLanguage, Ini.Language, ILanguage); - AddSelect(Theme.OptionsGame.SelectTabs, Ini.Tabs, ITabs); - AddSelectSlide(Theme.OptionsGame.SelectSorting, Ini.Sorting, ISorting); - AddSelect(Theme.OptionsGame.SelectDebug, Ini.Debug, IDebug); - + AddSelectSlide(Theme.OptionsGame.SelectPlayers, Ini.Players, IPlayers); + AddSelectSlide(Theme.OptionsGame.SelectDifficulty, Ini.Difficulty, IDifficulty); + AddSelectSlide(Theme.OptionsGame.SelectLanguage, Ini.Language, ILanguage); + AddSelectSlide(Theme.OptionsGame.SelectTabs, Ini.Tabs, ITabs); + AddSelectSlide(Theme.OptionsGame.SelectSorting, Ini.Sorting, ISorting); + AddSelectSlide(Theme.OptionsGame.SelectDebug, Ini.Debug, IDebug); AddButton(Theme.OptionsGame.ButtonExit); if (Length(Button[0].Text)=0) then diff --git a/Game/Code/Screens/UScreenOptionsGraphics.pas b/Game/Code/Screens/UScreenOptionsGraphics.pas index 9d8ee78a..08fca99d 100644 --- a/Game/Code/Screens/UScreenOptionsGraphics.pas +++ b/Game/Code/Screens/UScreenOptionsGraphics.pas @@ -38,7 +38,8 @@ begin SDLK_ESCAPE, SDLK_BACKSPACE : begin - Ini.Save; + // Escape -> save nothing - just leave this screen + AudioPlayback.PlaySound(SoundLib.Back); FadeTo(@ScreenOptions); end; @@ -89,11 +90,11 @@ begin LoadFromTheme(Theme.OptionsGraphics); - AddSelectSlide(Theme.OptionsGraphics.SelectSlideResolution, Ini.Resolution, IResolution); - AddSelect(Theme.OptionsGraphics.SelectFullscreen, Ini.Fullscreen, IFullscreen); - AddSelect(Theme.OptionsGraphics.SelectDepth, Ini.Depth, IDepth); - AddSelect(Theme.OptionsGraphics.SelectOscilloscope, Ini.Oscilloscope, IOscilloscope); - AddSelect(Theme.OptionsGraphics.SelectMovieSize, Ini.MovieSize, IMovieSize); + AddSelectSlide(Theme.OptionsGraphics.SelectResolution, Ini.Resolution, IResolution); + AddSelectSlide(Theme.OptionsGraphics.SelectFullscreen, Ini.Fullscreen, IFullscreen); + AddSelectSlide(Theme.OptionsGraphics.SelectDepth, Ini.Depth, IDepth); + AddSelectSlide(Theme.OptionsGraphics.SelectOscilloscope, Ini.Oscilloscope, IOscilloscope); + AddSelectSlide(Theme.OptionsGraphics.SelectMovieSize, Ini.MovieSize, IMovieSize); AddButton(Theme.OptionsGraphics.ButtonExit); diff --git a/Game/Code/Screens/UScreenOptionsLyrics.pas b/Game/Code/Screens/UScreenOptionsLyrics.pas index dec3b00c..42f1fadb 100644 --- a/Game/Code/Screens/UScreenOptionsLyrics.pas +++ b/Game/Code/Screens/UScreenOptionsLyrics.pas @@ -38,13 +38,14 @@ begin SDLK_ESCAPE, SDLK_BACKSPACE : begin - Ini.Save; + // Escape -> save nothing - just leave this screen + AudioPlayback.PlaySound(SoundLib.Back); FadeTo(@ScreenOptions); end; SDLK_RETURN: begin - if SelInteraction = 4 then begin + if SelInteraction = 3 then begin Ini.Save; AudioPlayback.PlaySound(SoundLib.Back); FadeTo(@ScreenOptions); @@ -80,10 +81,10 @@ begin LoadFromTheme(Theme.OptionsLyrics); - AddSelect(Theme.OptionsLyrics.SelectLyricsFont, Ini.LyricsFont, ILyricsFont); + AddSelectSlide(Theme.OptionsLyrics.SelectLyricsFont, Ini.LyricsFont, ILyricsFont); AddSelectSlide(Theme.OptionsLyrics.SelectLyricsEffect, Ini.LyricsEffect, ILyricsEffect); - AddSelect(Theme.OptionsLyrics.SelectSolmization, Ini.Solmization, ISolmization); - AddSelect(Theme.OptionsLyrics.SelectNoteLines, Ini.NoteLines, INoteLines); + //AddSelect(Theme.OptionsLyrics.SelectSolmization, Ini.Solmization, ISolmization); GAH!!!!11 DIE!!! + AddSelectSlide(Theme.OptionsLyrics.SelectNoteLines, Ini.NoteLines, INoteLines); AddButton(Theme.OptionsLyrics.ButtonExit); diff --git a/Game/Code/Screens/UScreenOptionsRecord.pas b/Game/Code/Screens/UScreenOptionsRecord.pas index c5d1d328..885f7db5 100644 --- a/Game/Code/Screens/UScreenOptionsRecord.pas +++ b/Game/Code/Screens/UScreenOptionsRecord.pas @@ -141,7 +141,8 @@ begin SDLK_ESCAPE, SDLK_BACKSPACE: begin - Ini.Save; + // Escape -> save nothing - just leave this screen + AudioPlayback.PlaySound(SoundLib.Back); FadeTo(@ScreenOptions); end; @@ -188,7 +189,7 @@ var InputDevice: TAudioInputDevice; InputDeviceCfg: PInputDeviceConfig; ChannelTheme: ^TThemeSelectSlide; - ButtonTheme: TThemeButton; + //ButtonTheme: TThemeButton; WidgetYPos: integer; begin inherited Create; @@ -283,11 +284,13 @@ begin end; // add Exit-button - ButtonTheme := Theme.OptionsRecord.ButtonExit; + //ButtonTheme := Theme.OptionsRecord.ButtonExit; // adjust button position - if (WidgetYPos <> 0) then - ButtonTheme.Y := WidgetYPos; - AddButton(ButtonTheme); + //if (WidgetYPos <> 0) then + // ButtonTheme.Y := WidgetYPos; + //AddButton(ButtonTheme); + // I uncommented the stuff above, because it's not skinable :X + AddButton(Theme.OptionsRecord.ButtonExit); if (Length(Button[0].Text) = 0) then AddButtonText(14, 20, Theme.Options.Description[7]); // store InteractionID diff --git a/Game/Code/Screens/UScreenOptionsSound.pas b/Game/Code/Screens/UScreenOptionsSound.pas index 2d807d02..ba487937 100644 --- a/Game/Code/Screens/UScreenOptionsSound.pas +++ b/Game/Code/Screens/UScreenOptionsSound.pas @@ -42,7 +42,8 @@ begin SDLK_ESCAPE, SDLK_BACKSPACE : begin - Ini.Save; + // Escape -> save nothing - just leave this screen + AudioPlayback.PlaySound(SoundLib.Back); FadeTo(@ScreenOptions); end; @@ -84,10 +85,10 @@ begin LoadFromTheme(Theme.OptionsSound); - AddSelect(Theme.OptionsSound.SelectMicBoost, Ini.MicBoost, IMicBoost); // TODO - This need moving to ScreenOptionsRecord - AddSelect(Theme.OptionsSound.SelectClickAssist, Ini.ClickAssist, IClickAssist); - AddSelect(Theme.OptionsSound.SelectBeatClick, Ini.BeatClick, IBeatClick); - AddSelect(Theme.OptionsSound.SelectThreshold, Ini.ThresholdIndex, IThreshold); + AddSelectSlide(Theme.OptionsSound.SelectMicBoost, Ini.MicBoost, IMicBoost); // TODO - This need moving to ScreenOptionsRecord + AddSelectSlide(Theme.OptionsSound.SelectClickAssist, Ini.ClickAssist, IClickAssist); + AddSelectSlide(Theme.OptionsSound.SelectBeatClick, Ini.BeatClick, IBeatClick); + AddSelectSlide(Theme.OptionsSound.SelectThreshold, Ini.ThresholdIndex, IThreshold); //Song Preview AddSelectSlide(Theme.OptionsSound.SelectSlidePreviewVolume, Ini.PreviewVolume, IPreviewVolume); diff --git a/Game/Code/Screens/UScreenOptionsThemes.pas b/Game/Code/Screens/UScreenOptionsThemes.pas index 743f5fda..a4f00b64 100644 --- a/Game/Code/Screens/UScreenOptionsThemes.pas +++ b/Game/Code/Screens/UScreenOptionsThemes.pas @@ -52,12 +52,7 @@ begin SDLK_ESCAPE, SDLK_BACKSPACE : begin - Ini.Save; - - // Reload all screens, after Theme changed - // Todo : JB - Check if theme was actually changed - UGraphic.UnLoadScreens(); - UGraphic.LoadScreens(); + // Escape -> save nothing - just leave this screen AudioPlayback.PlaySound(SoundLib.Back); FadeTo(@ScreenOptions); -- cgit v1.2.3