- 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, 17 insertions, 2 deletions

diff --git a/Game/Code/Screens/UScreenSing.pas b/Game/Code/Screens/UScreenSing.pas
index f9d59552..46f7b63c 100644
--- a/Game/Code/Screens/UScreenSing.pas
+++ b/Game/Code/Screens/UScreenSing.pas
@@ -225,7 +225,7 @@ begin
             Exit;

             

           Inc(ShowNotes);

-          if (ShowNotes>2) then

+          if (ShowNotes>3) then

             ShowNotes:=0;

         end;

 

@@ -283,7 +283,8 @@ begin
 

       SDLK_S:

         begin

-          Ini.PossibleScore := (Ini.PossibleScore+1) mod 4;

+          if (ScreenSong.Mode = smNormal) then

+            Ini.PossibleScore := (Ini.PossibleScore+1) mod 4;

           //Ini.Save;

         end;

 

@@ -2091,10 +2092,22 @@ begin
   end;

 

   Static[StaticLyricBar].Texture.Alpha := Alpha[1];

+  if (ShowNotes<3) then

+    Static[StaticLyricBar].Visible := true

+  else

+    Static[StaticLyricBar].Visible := false;

 

   if AktSong.isDuet then

+  begin

     Static[StaticLyricDuetBar].Texture.Alpha := Alpha[0];

 

+    if (ShowNotes<3) then

+      Static[StaticLyricDuetBar].Visible := true

+    else

+      Static[StaticLyricDuetBar].Visible := false;

+  end;

+

+

   // draw custom items

   SingDraw(Alpha);  // always draw

 

@@ -2274,6 +2287,8 @@ begin
     end else if(ScreenSong.Mode = smNormal) then

     begin

       singmode := 'Normal';

+      if AktSong.isDuet then

+        singmode := singmode + ' (Duet)';

     end;

 

     if not ScreenSong.SungToEnd then