Changed aadvanced options to switch on/off sing-effects and screen-fading

Changed Languages (english, german) and Theme (deluxe) to reflect these changes
implemented checks for config values to make these things work as expected

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@101 b956fd51-792f-4845-bead-9b4dfca2ff2c

2 files changed, 5 insertions, 4 deletions

diff --git a/Game/Code/Screens/UScreenOptionsAdvanced.pas b/Game/Code/Screens/UScreenOptionsAdvanced.pas
index 7904a284..ed3bc164 100644
--- a/Game/Code/Screens/UScreenOptionsAdvanced.pas
+++ b/Game/Code/Screens/UScreenOptionsAdvanced.pas
@@ -74,8 +74,8 @@ begin
     AddText(Theme.OptionsAdvanced.Text[I]);

 

   AddSelect(Theme.OptionsAdvanced.SelectLoadAnimation, Ini.LoadAnimation, ILoadAnimation);

-  AddSelect(Theme.OptionsAdvanced.SelectEffectPerfect, Ini.EffectPerfect, IEffectPerfect);

-  AddSelect(Theme.OptionsAdvanced.SelectEffectGolden, Ini.EffectGolden, IEffectGolden);

+  AddSelect(Theme.OptionsAdvanced.SelectScreenFade, Ini.ScreenFade, IScreenFade);

+  AddSelect(Theme.OptionsAdvanced.SelectEffectSing, Ini.EffectSing, IEffectSing);

   AddSelect(Theme.OptionsAdvanced.SelectLineBonus, Ini.LineBonus, ILineBonus);

   AddSelectSlide(Theme.OptionsAdvanced.SelectOnSongClick, Ini.OnSongClick, IOnSongClick);

   AddSelect(Theme.OptionsAdvanced.SelectAskbeforeDel, Ini.AskbeforeDel, IAskbeforeDel);

diff --git a/Game/Code/Screens/UScreenSing.pas b/Game/Code/Screens/UScreenSing.pas
index e4fd7add..29ea5c8b 100644
--- a/Game/Code/Screens/UScreenSing.pas
+++ b/Game/Code/Screens/UScreenSing.pas
@@ -1115,7 +1115,7 @@ begin
     //PhrasenBonus - Line Bonus Mod End// }

 

     //PerfectLineTwinkle Mod (effect) Pt.1

-    If (Ini.EffectPerfect>=1) then

+    If (Ini.EffectSing=1) then

     begin

       if A >= 8 then Player[I].LastSentencePerfect := True

       else Player[I].LastSentencePerfect := False;

@@ -1128,7 +1128,8 @@ begin
   end;

 

   //PerfectLineTwinkle Mod (effect) Pt.2

-  GoldenRec.SpawnPerfectLineTwinkle;

+  if Ini.EffectSing=1 then

+    GoldenRec.SpawnPerfectLineTwinkle;

   //PerfectLineTwinkle Mod end

 end;