- hide lyrics also by pressing N

- support for more than one song folder
- added track number in error.log for duet songs
- fixed sorting by title and artist: sort by artist or title first
- added more text messages in editor
- copy and move lines between tracks in duet songs is possible again
- adjust player number in screenname
- don't show possible scores in party modes (collidates with some plugins)




git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/1.0.1 Challenge MOD@2743 b956fd51-792f-4845-bead-9b4dfca2ff2c

1 files changed, 137 insertions, 104 deletions

diff --git a/Game/Code/Screens/UScreenName.pas b/Game/Code/Screens/UScreenName.pas
index ee81901f..a00f8831 100644
--- a/Game/Code/Screens/UScreenName.pas
+++ b/Game/Code/Screens/UScreenName.pas
@@ -12,6 +12,7 @@ type
       constructor Create; override;

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

       procedure onShow; override;

+      procedure Refresh;

       procedure SetAnimationProgress(Progress: real); override;

   end;

 

@@ -49,113 +50,101 @@ begin
 

       // Templates for Names Mod

       SDLK_F1:

-       if (SDL_ModState = KMOD_LALT) then

-         begin

-           Ini.NameTemplate[0] := Button[Interaction].Text[0].Text;

-         end

-         else

-         begin

-           Button[Interaction].Text[0].Text := Ini.NameTemplate[0];

-         end;

+        if (SDL_ModState = KMOD_LALT) then

+        begin

+          Ini.NameTemplate[0] := Button[Interaction].Text[0].Text;

+        end else

+        begin

+          Button[Interaction].Text[0].Text := Ini.NameTemplate[0];

+        end;

       SDLK_F2:

-       if (SDL_ModState = KMOD_LALT) then

-         begin

-           Ini.NameTemplate[1] := Button[Interaction].Text[0].Text;

-         end

-         else

-         begin

-           Button[Interaction].Text[0].Text := Ini.NameTemplate[1];

-         end;

+        if (SDL_ModState = KMOD_LALT) then

+        begin

+          Ini.NameTemplate[1] := Button[Interaction].Text[0].Text;

+        end else

+        begin

+          Button[Interaction].Text[0].Text := Ini.NameTemplate[1];

+        end;

       SDLK_F3:

-       if (SDL_ModState = KMOD_LALT) then

-         begin

-           Ini.NameTemplate[2] := Button[Interaction].Text[0].Text;

-         end

-         else

-         begin

-           Button[Interaction].Text[0].Text := Ini.NameTemplate[2];

-         end;

+        if (SDL_ModState = KMOD_LALT) then

+        begin

+          Ini.NameTemplate[2] := Button[Interaction].Text[0].Text;

+        end else

+        begin

+          Button[Interaction].Text[0].Text := Ini.NameTemplate[2];

+        end;

       SDLK_F4:

-       if (SDL_ModState = KMOD_LALT) then

-         begin

-           Ini.NameTemplate[3] := Button[Interaction].Text[0].Text;

-         end

-         else

-         begin

-           Button[Interaction].Text[0].Text := Ini.NameTemplate[3];

-         end;

+        if (SDL_ModState = KMOD_LALT) then

+        begin

+          Ini.NameTemplate[3] := Button[Interaction].Text[0].Text;

+        end else

+        begin

+          Button[Interaction].Text[0].Text := Ini.NameTemplate[3];

+        end;

       SDLK_F5:

-       if (SDL_ModState = KMOD_LALT) then

-         begin

-           Ini.NameTemplate[4] := Button[Interaction].Text[0].Text;

-         end

-         else

-         begin

-           Button[Interaction].Text[0].Text := Ini.NameTemplate[4];

-         end;

+        if (SDL_ModState = KMOD_LALT) then

+        begin

+          Ini.NameTemplate[4] := Button[Interaction].Text[0].Text;

+        end else

+        begin

+          Button[Interaction].Text[0].Text := Ini.NameTemplate[4];

+        end;

       SDLK_F6:

-       if (SDL_ModState = KMOD_LALT) then

-         begin

-           Ini.NameTemplate[5] := Button[Interaction].Text[0].Text;

-         end

-         else

-         begin

-           Button[Interaction].Text[0].Text := Ini.NameTemplate[5];

-         end;

+        if (SDL_ModState = KMOD_LALT) then

+        begin

+          Ini.NameTemplate[5] := Button[Interaction].Text[0].Text;

+        end else

+        begin

+          Button[Interaction].Text[0].Text := Ini.NameTemplate[5];

+        end;

       SDLK_F7:

-       if (SDL_ModState = KMOD_LALT) then

-         begin

-           Ini.NameTemplate[6] := Button[Interaction].Text[0].Text;

-         end

-         else

-         begin

-           Button[Interaction].Text[0].Text := Ini.NameTemplate[6];

-         end;

+        if (SDL_ModState = KMOD_LALT) then

+        begin

+          Ini.NameTemplate[6] := Button[Interaction].Text[0].Text;

+        end else

+        begin

+          Button[Interaction].Text[0].Text := Ini.NameTemplate[6];

+        end;

       SDLK_F8:

-       if (SDL_ModState = KMOD_LALT) then

-         begin

-           Ini.NameTemplate[7] := Button[Interaction].Text[0].Text;

-         end

-         else

-         begin

-           Button[Interaction].Text[0].Text := Ini.NameTemplate[7];

-         end;

+        if (SDL_ModState = KMOD_LALT) then

+        begin

+          Ini.NameTemplate[7] := Button[Interaction].Text[0].Text;

+        end else

+        begin

+          Button[Interaction].Text[0].Text := Ini.NameTemplate[7];

+        end;

       SDLK_F9:

-       if (SDL_ModState = KMOD_LALT) then

-         begin

-           Ini.NameTemplate[8] := Button[Interaction].Text[0].Text;

-         end

-         else

-         begin

-           Button[Interaction].Text[0].Text := Ini.NameTemplate[8];

-         end;

+        if (SDL_ModState = KMOD_LALT) then

+        begin

+          Ini.NameTemplate[8] := Button[Interaction].Text[0].Text;

+        end else

+        begin

+          Button[Interaction].Text[0].Text := Ini.NameTemplate[8];

+        end;

       SDLK_F10:

-       if (SDL_ModState = KMOD_LALT) then

-         begin

-           Ini.NameTemplate[9] := Button[Interaction].Text[0].Text;

-         end

-         else

-         begin

-           Button[Interaction].Text[0].Text := Ini.NameTemplate[9];

-         end;

+        if (SDL_ModState = KMOD_LALT) then

+        begin

+          Ini.NameTemplate[9] := Button[Interaction].Text[0].Text;

+        end else

+        begin

+          Button[Interaction].Text[0].Text := Ini.NameTemplate[9];

+        end;

       SDLK_F11:

-       if (SDL_ModState = KMOD_LALT) then

-         begin

-           Ini.NameTemplate[10] := Button[Interaction].Text[0].Text;

-         end

-         else

-         begin

-           Button[Interaction].Text[0].Text := Ini.NameTemplate[10];

-         end;

+        if (SDL_ModState = KMOD_LALT) then

+        begin

+          Ini.NameTemplate[10] := Button[Interaction].Text[0].Text;

+        end else

+        begin

+          Button[Interaction].Text[0].Text := Ini.NameTemplate[10];

+        end;

       SDLK_F12:

-       if (SDL_ModState = KMOD_LALT) then

-         begin

-           Ini.NameTemplate[11] := Button[Interaction].Text[0].Text;

-         end

-         else

-         begin

-           Button[Interaction].Text[0].Text := Ini.NameTemplate[11];

-         end;

+        if (SDL_ModState = KMOD_LALT) then

+        begin

+          Ini.NameTemplate[11] := Button[Interaction].Text[0].Text;

+        end else

+        begin

+          Button[Interaction].Text[0].Text := Ini.NameTemplate[11];

+        end;

 

 

       SDLK_BACKSPACE:

@@ -191,10 +180,44 @@ begin
       // Up and Down could be done at the same time,

       // but I don't want to declare variables inside

       // functions like this one, called so many times

-      SDLK_DOWN:    InteractNext;

-      SDLK_UP:      InteractPrev;

-      SDLK_RIGHT:   InteractNext;

-      SDLK_LEFT:    InteractPrev;

+      SDLK_DOWN:

+        begin

+          if (SDL_ModState = KMOD_LSHIFT) then

+          begin

+            if (Ini.Players>0) then

+              Dec(Ini.Players);

+

+            if (Ini.Players >= 0) and (Ini.Players <= 3) then PlayersPlay := Ini.Players + 1;

+            if (Ini.Players = 4) then PlayersPlay := 6;

+

+            Refresh;

+          end else

+            InteractNext;

+        end;

+

+      SDLK_UP:

+        begin

+          if (SDL_ModState = KMOD_LSHIFT) then

+          begin

+            if (Ini.Players<4) then

+              Inc(Ini.Players);

+

+            if (Ini.Players >= 0) and (Ini.Players <= 3) then PlayersPlay := Ini.Players + 1;

+            if (Ini.Players = 4) then PlayersPlay := 6;

+            Refresh;

+          end else

+            InteractPrev;

+        end;

+

+      SDLK_RIGHT:

+        begin

+          InteractNext;

+        end;

+

+      SDLK_LEFT:

+        begin

+          InteractPrev;

+        end;

 

     end;

   end;

@@ -222,17 +245,27 @@ begin
   for I := 1 to 6 do

     Button[I-1].Text[0].Text := Ini.Name[I-1];

 

-  for I := 1 to PlayersPlay do begin

+  Refresh;

+

+  if not Help.SetHelpID(ID) then

+    Log.LogError('No Entry for Help-ID ' + ID + ' (ScreenName)');

+end;

+

+procedure TScreenName.Refresh;

+var

+  I:    integer;

+begin

+  for I := 1 to PlayersPlay do

+  begin

     Button[I-1].Visible := true;

     Button[I-1].Selectable := true;

   end;

 

-  for I := PlayersPlay+1 to 6 do begin

+  for I := PlayersPlay+1 to 6 do

+  begin

     Button[I-1].Visible := false;

     Button[I-1].Selectable := false;

   end;

-  if not Help.SetHelpID(ID) then

-    Log.LogError('No Entry for Help-ID ' + ID + ' (ScreenName)');

 end;

 

 procedure TScreenName.SetAnimationProgress(Progress: real);