- 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, 14 insertions, 7 deletions

diff --git a/Game/Code/Classes/UDraw.pas b/Game/Code/Classes/UDraw.pas
index e4735a39..8b7fd8b4 100644
--- a/Game/Code/Classes/UDraw.pas
+++ b/Game/Code/Classes/UDraw.pas
@@ -64,7 +64,7 @@ var
   TickOld: cardinal;

   TickOld2:cardinal;

   //end Singbar Mod

-  ShowNotes:  integer; //0=show all; 1=don't show notes+rating; 2=don't show notes, rating, score+score bar

+  ShowNotes:  integer; //0=show all; 1=don't show notes+rating; 2=don't show notes, rating, score+score bar; 3=also lyrics

 

 

 

@@ -724,19 +724,26 @@ begin
   ScreenSing.LyricMain[0].SetAlpha(Alpha[0]);

   ScreenSing.LyricSub[0].SetAlpha(Alpha[2]);

 

-  ScreenSing.LyricMain[0].Draw;

-  ScreenSing.LyricSub[0].Draw;

 

-  SingDrawLyricHelper(0, NR);

+  if (ShowNotes<3) then

+  begin

+    ScreenSing.LyricMain[0].Draw;

+    ScreenSing.LyricSub[0].Draw;

+

+    SingDrawLyricHelper(0, NR);

+  end;

 

   if (AktSong.isDuet) then

   begin

     ScreenSing.LyricMain[1].SetAlpha(Alpha[1]);

     ScreenSing.LyricSub[1].SetAlpha(Alpha[3]);

 

-    ScreenSing.LyricMain[1].Draw;

-    ScreenSing.LyricSub[1].Draw;

-    SingDrawLyricHelper(1, NR);

+    if (ShowNotes<3) then

+    begin

+      ScreenSing.LyricMain[1].Draw;

+      ScreenSing.LyricSub[1].Draw;

+      SingDrawLyricHelper(1, NR);

+    end;

   end;

 

   // oscilloscope