new lyric effect: slide

a lot lyric fixes
change the resolution/fullscreen mode on exit the options menu
some code improvements


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

3 files changed, 216 insertions, 222 deletions

diff --git a/Game/Code/Screens/UScreenOptionsGraphics.pas b/Game/Code/Screens/UScreenOptionsGraphics.pas
index ea14a419..8b6e8454 100644
--- a/Game/Code/Screens/UScreenOptionsGraphics.pas
+++ b/Game/Code/Screens/UScreenOptionsGraphics.pas
@@ -1,101 +1,102 @@
-unit UScreenOptionsGraphics;
-
-interface
-
-{$I switches.inc}
-
-uses
-  UMenu, SDL, UDisplay, UMusic, UFiles, UIni, UThemes;
-
-type
-  TScreenOptionsGraphics = class(TMenu)
-    public
-      constructor Create; override;
-      function ParseInput(PressedKey: Cardinal; ScanCode: byte; PressedDown: Boolean): Boolean; override;
-      procedure onShow; override;
-  end;
-
-implementation
-
-uses UGraphic, UMain;
-
-function TScreenOptionsGraphics.ParseInput(PressedKey: Cardinal; ScanCode: byte; PressedDown: Boolean): Boolean;
-begin
-  Result := true;
-  If (PressedDown) Then
-  begin // Key Down
-    case PressedKey of
-      SDLK_Q:
-        begin
-          Result := false;
-        end;
-
-      SDLK_ESCAPE,
-      SDLK_BACKSPACE :
-        begin
-          Ini.Save;
-          AudioPlayback.PlaySound(SoundLib.Back);
-          FadeTo(@ScreenOptions);
-        end;
-      SDLK_RETURN:
-        begin
-{          if SelInteraction <= 1 then begin
-            Restart := true;
-          end;}
-          if SelInteraction = 5 then begin
-            Ini.Save;
-            AudioPlayback.PlaySound(SoundLib.Back);
-            FadeTo(@ScreenOptions);
-          end;
-        end;
-      SDLK_DOWN:
-        InteractNext;
-      SDLK_UP :
-        InteractPrev;
-      SDLK_RIGHT:
-        begin
-          if (SelInteraction >= 0) and (SelInteraction <= 4) then begin
-            AudioPlayback.PlaySound(SoundLib.Option);
-            InteractInc;
-          end;
-        end;
-      SDLK_LEFT:
-        begin
-          if (SelInteraction >= 0) and (SelInteraction <= 4) then begin
-            AudioPlayback.PlaySound(SoundLib.Option);
-            InteractDec;
-          end;
-        end;
-    end;
-  end;
-end;
-
-constructor TScreenOptionsGraphics.Create;
-//var
-// I:      integer; // Auto Removed, Unused Variable
-begin
-  inherited Create;
-
-  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);
-
-
-  AddButton(Theme.OptionsGraphics.ButtonExit);
-  if (Length(Button[0].Text)=0) then
-    AddButtonText(14, 20, Theme.Options.Description[7]);
-
-end;
-
-procedure TScreenOptionsGraphics.onShow;
-begin
-  inherited;
-
-  Interaction := 0;
-end;
-
-end.
+unit UScreenOptionsGraphics;

+

+interface

+

+{$I switches.inc}

+

+uses

+  UMenu, SDL, UDisplay, UMusic, UFiles, UIni, UThemes;

+

+type

+  TScreenOptionsGraphics = class(TMenu)

+    public

+      constructor Create; override;

+      function ParseInput(PressedKey: Cardinal; ScanCode: byte; PressedDown: Boolean): Boolean; override;

+      procedure onShow; override;

+  end;

+

+implementation

+

+uses UGraphic, UMain;

+

+function TScreenOptionsGraphics.ParseInput(PressedKey: Cardinal; ScanCode: byte; PressedDown: Boolean): Boolean;

+begin

+  Result := true;

+  If (PressedDown) Then

+  begin // Key Down

+    case PressedKey of

+      SDLK_Q:

+        begin

+          Result := false;

+        end;

+

+      SDLK_ESCAPE,

+      SDLK_BACKSPACE :

+        begin

+          Ini.Save;

+          AudioPlayback.PlaySound(SoundLib.Back);

+          FadeTo(@ScreenOptions);

+        end;

+      SDLK_RETURN:

+        begin

+{          if SelInteraction <= 1 then begin

+            Restart := true;

+          end;}

+          if SelInteraction = 5 then begin

+            Ini.Save;

+            AudioPlayback.PlaySound(SoundLib.Back);

+			Reinitialize3D();           

+            FadeTo(@ScreenOptions);

+          end;

+        end;

+      SDLK_DOWN:

+        InteractNext;

+      SDLK_UP :

+        InteractPrev;

+      SDLK_RIGHT:

+        begin

+          if (SelInteraction >= 0) and (SelInteraction <= 4) then begin

+            AudioPlayback.PlaySound(SoundLib.Option);

+            InteractInc;

+          end;

+        end;

+      SDLK_LEFT:

+        begin

+          if (SelInteraction >= 0) and (SelInteraction <= 4) then begin

+            AudioPlayback.PlaySound(SoundLib.Option);

+            InteractDec;

+          end;

+        end;

+    end;

+  end;

+end;

+

+constructor TScreenOptionsGraphics.Create;

+//var

+// I:      integer; // Auto Removed, Unused Variable

+begin

+  inherited Create;

+

+  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);

+

+

+  AddButton(Theme.OptionsGraphics.ButtonExit);

+  if (Length(Button[0].Text)=0) then

+    AddButtonText(14, 20, Theme.Options.Description[7]);

+

+end;

+

+procedure TScreenOptionsGraphics.onShow;

+begin

+  inherited;

+

+  Interaction := 0;

+end;

+

+end.

diff --git a/Game/Code/Screens/UScreenOptionsLyrics.pas b/Game/Code/Screens/UScreenOptionsLyrics.pas
index 713726f1..648795a3 100644
--- a/Game/Code/Screens/UScreenOptionsLyrics.pas
+++ b/Game/Code/Screens/UScreenOptionsLyrics.pas
@@ -1,96 +1,96 @@
-unit UScreenOptionsLyrics;
-
-interface
-
-{$I switches.inc}
-
-uses
-  UMenu, SDL, UDisplay, UMusic, UFiles, UIni, UThemes;
-
-type
-  TScreenOptionsLyrics = class(TMenu)
-    public
-      constructor Create; override;
-      function ParseInput(PressedKey: Cardinal; ScanCode: byte; PressedDown: Boolean): Boolean; override;
-      procedure onShow; override;
-  end;
-
-implementation
-
-uses UGraphic;
-
-function TScreenOptionsLyrics.ParseInput(PressedKey: Cardinal; ScanCode: byte; PressedDown: Boolean): Boolean;
-begin
-  Result := true;
-  If (PressedDown) Then
-  begin // Key Down
-    case PressedKey of
-      SDLK_Q:
-        begin
-          Result := false;
-        end;
-
-      SDLK_ESCAPE,
-      SDLK_BACKSPACE :
-        begin
-          Ini.Save;
-          AudioPlayback.PlaySound(SoundLib.Back);
-          FadeTo(@ScreenOptions);
-        end;
-      SDLK_RETURN:
-        begin
-          if SelInteraction = 3 then begin
-            Ini.Save;
-            AudioPlayback.PlaySound(SoundLib.Back);
-            FadeTo(@ScreenOptions);
-          end;
-        end;
-      SDLK_DOWN:
-        InteractNext;
-      SDLK_UP :
-        InteractPrev;
-      SDLK_RIGHT:
-        begin
-          if (SelInteraction >= 0) and (SelInteraction <= 2) then begin
-            AudioPlayback.PlaySound(SoundLib.Option);
-            InteractInc;
-          end;
-        end;
-      SDLK_LEFT:
-        begin
-          if (SelInteraction >= 0) and (SelInteraction <= 2) then begin
-            AudioPlayback.PlaySound(SoundLib.Option);
-            InteractDec;
-          end;
-        end;
-    end;
-  end;
-end;
-
-constructor TScreenOptionsLyrics.Create;
-//var
-// I:      integer; // Auto Removed, Unused Variable
-begin
-  inherited Create;
-
-  LoadFromTheme(Theme.OptionsLyrics);
-
-  AddSelect(Theme.OptionsLyrics.SelectLyricsFont, Ini.LyricsFont, ILyricsFont);
-  AddSelect(Theme.OptionsLyrics.SelectLyricsEffect, Ini.LyricsEffect, ILyricsEffect);
-  AddSelect(Theme.OptionsLyrics.SelectSolmization, Ini.Solmization, ISolmization);
-
-
-  AddButton(Theme.OptionsLyrics.ButtonExit);
-  if (Length(Button[0].Text)=0) then
-    AddButtonText(14, 20, Theme.Options.Description[7]);
-
-end;
-
-procedure TScreenOptionsLyrics.onShow;
-begin
-  inherited;
-
-  Interaction := 0;
-end;
-
-end.
+unit UScreenOptionsLyrics;

+

+interface

+

+{$I switches.inc}

+

+uses

+  UMenu, SDL, UDisplay, UMusic, UFiles, UIni, UThemes;

+

+type

+  TScreenOptionsLyrics = class(TMenu)

+    public

+      constructor Create; override;

+      function ParseInput(PressedKey: Cardinal; ScanCode: byte; PressedDown: Boolean): Boolean; override;

+      procedure onShow; override;

+  end;

+

+implementation

+

+uses UGraphic;

+

+function TScreenOptionsLyrics.ParseInput(PressedKey: Cardinal; ScanCode: byte; PressedDown: Boolean): Boolean;

+begin

+  Result := true;

+  If (PressedDown) Then

+  begin // Key Down

+    case PressedKey of

+      SDLK_Q:

+        begin

+          Result := false;

+        end;

+

+      SDLK_ESCAPE,

+      SDLK_BACKSPACE :

+        begin

+          Ini.Save;

+          AudioPlayback.PlaySound(SoundLib.Back);

+          FadeTo(@ScreenOptions);

+        end;

+      SDLK_RETURN:

+        begin

+          if SelInteraction = 3 then begin

+            Ini.Save;

+            AudioPlayback.PlaySound(SoundLib.Back);

+            FadeTo(@ScreenOptions);

+          end;

+        end;

+      SDLK_DOWN:

+        InteractNext;

+      SDLK_UP :

+        InteractPrev;

+      SDLK_RIGHT:

+        begin

+          if (SelInteraction >= 0) and (SelInteraction <= 2) then begin

+            AudioPlayback.PlaySound(SoundLib.Option);

+            InteractInc;

+          end;

+        end;

+      SDLK_LEFT:

+        begin

+          if (SelInteraction >= 0) and (SelInteraction <= 2) then begin

+            AudioPlayback.PlaySound(SoundLib.Option);

+            InteractDec;

+          end;

+        end;

+    end;

+  end;

+end;

+

+constructor TScreenOptionsLyrics.Create;

+//var

+// I:      integer; // Auto Removed, Unused Variable

+begin

+  inherited Create;

+

+  LoadFromTheme(Theme.OptionsLyrics);

+

+  AddSelect(Theme.OptionsLyrics.SelectLyricsFont, Ini.LyricsFont, ILyricsFont);

+  AddSelectSlide(Theme.OptionsLyrics.SelectLyricsEffect, Ini.LyricsEffect, ILyricsEffect);

+  AddSelect(Theme.OptionsLyrics.SelectSolmization, Ini.Solmization, ISolmization);

+

+

+  AddButton(Theme.OptionsLyrics.ButtonExit);

+  if (Length(Button[0].Text)=0) then

+    AddButtonText(14, 20, Theme.Options.Description[7]);

+

+end;

+

+procedure TScreenOptionsLyrics.onShow;

+begin

+  inherited;

+

+  Interaction := 0;

+end;

+

+end.

diff --git a/Game/Code/Screens/UScreenSing.pas b/Game/Code/Screens/UScreenSing.pas
index 4293d148..ad8325a2 100644
--- a/Game/Code/Screens/UScreenSing.pas
+++ b/Game/Code/Screens/UScreenSing.pas
@@ -158,11 +158,7 @@ begin
           FadeTo(@ScreenScore);
         end;
 
-      SDLK_P://Pause Mod
-        begin
-          Pause;
-        end;
-
+      SDLK_P,
       SDLK_SPACE://Pause Mod
         begin
           Pause;
@@ -635,17 +631,10 @@ begin
       end;
   end; // case
 
-  case Ini.LyricsEffect of
-    0:  Lyrics.HoverEffekt := 1; // 0 - one selected, 1 - selected all to the current
-    1:  Lyrics.HoverEffekt := 2;
-    2:  Lyrics.HoverEffekt := 3;
-    3:  Lyrics.HoverEffekt := 4;
-  end; // case
-
   // Add Lines to Lyrics
   While (not Lyrics.LineinQueue) AND (Lyrics.LineCounter <= High(Lines[0].Line)) do
-      Lyrics.AddLine(@Lines[0].Line[Lyrics.LineCounter]);
-
+    Lyrics.AddLine(@Lines[0].Line[Lyrics.LineCounter]);
+  
   //UpdateLCD; //TODO: maybe LCD Support as Plugin?
 
   //Deactivate Pause
@@ -1399,17 +1388,21 @@ begin
   GoldenRec.SentenceChange;
   if (Lyrics.LineCounter <= High(Lines[0].Line)) then
   begin
-      Lyrics.AddLine(@Lines[0].Line[Lyrics.LineCounter]);
-      // addline uses display memory
-      // calling draw makes sure, there's the singscreen in it, when the next
-      // swap between onscreen and offscreen buffers is done
-      // (this eliminates the onSentenceChange flickering)
-      // note: maybe it would be better to make sure, a display redraw is done
-      //     right after the sentence change (before buffer swap) or make sure
-      //     onsentencechange is only called right before calling Display.Draw
-      //     (or whatever it was called)
-      Draw;
-  end;
+      Lyrics.AddLine(@Lines[0].Line[Lyrics.LineCounter]);  
+  end
+  else
+    Lyrics.AddLine(nil);
+  
+  // addline uses display memory
+  // calling draw makes sure, there's the singscreen in it, when the next
+  // swap between onscreen and offscreen buffers is done
+  // (this eliminates the onSentenceChange flickering)
+  // note: maybe it would be better to make sure, a display redraw is done
+  //     right after the sentence change (before buffer swap) or make sure
+  //     onsentencechange is only called right before calling Display.Draw
+  //     (or whatever it was called)
+  Draw;
+
   //GoldenStarsTwinkle Mod End
 end;