- fix: position of player 3 and 4 in 4-player-mode on one screen in singscreen

- fix: scorescreen for 4-player-mode on one screen
- add: tag #CALCMEDLEY:Off => disable calculation of medley for that song
- add: sorting RANDOM for party-modes
- add: ShuffleMode FULL (play whole file) in fullscreen if video available
- add: it possible to select the 2 songs left and right of the random selected song in party mode
- add: num song in in party options (in the selected folder/playlist)
- fix: dont change line in editor while playing only one line
- removed option solmization from lyric option screen
- add: play last sung song in party score screen
- added some plugins (thx to MasterPhW)

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

1 files changed, 48 insertions, 2 deletions

diff --git a/Game/Code/Classes/UFiles.pas b/Game/Code/Classes/UFiles.pas
index 16ff7c63..2b051353 100644
--- a/Game/Code/Classes/UFiles.pas
+++ b/Game/Code/Classes/UFiles.pas
@@ -133,6 +133,7 @@ begin
   SetLength(Song.Edition, 1);

   Song.Edition[0] := 'Unknown';

   Song.Language := 'Unknown'; //Language Patch

+  Song.Year := '';

 

   //Required Information

   Song.Mp3 := '';

@@ -152,8 +153,12 @@ begin
   Song.Resolution := 4;

   Song.Creator := '';

   Song.Medley.Source:=msNone;

+  Song.CalcMedley := true;

   Song.PreviewStart := 0;

   SetLength(Song.CustomTags, 0);

+  SetLength(Song.DuetNames, 2);

+  Song.DuetNames[0] := 'P1';

+  Song.DuetNames[1] := 'P2';

 end;

 

 //--------------------

@@ -350,6 +355,12 @@ begin
           Song.Language := Value;

         end

 

+        //Year Sorting

+        else if (Identifier = 'YEAR') then

+        begin

+          Song.Year := Value;

+        end

+

         // Song Start

         else if (Identifier = 'START') then

         begin

@@ -406,6 +417,25 @@ begin
             MedleyFlags := MedleyFlags or 4;

         end

 

+        // Medley

+        else if (Identifier = 'CALCMEDLEY') then

+        begin

+          if (Uppercase(Value) = 'OFF') then

+            Song.CalcMedley := false;

+        end

+

+        // Duet Singer Name P1

+        else if (Identifier = 'DUETSINGERP1') then

+        begin

+          Song.DuetNames[0] := Value;

+        end

+

+        // Duet Singer Name P2

+        else if (Identifier = 'DUETSINGERP2') then

+        begin

+          Song.DuetNames[1] := Value;

+        end

+

         // unsupported tag

         else

         begin

@@ -1128,13 +1158,17 @@ begin
 

   if Song.Creator     <> '' then    WriteLn(SongFile, '#CREATOR:'     + Song.Creator);

 

+  if Song.Language    <> 'Unknown' then    WriteLn(SongFile, '#LANGUAGE:'    + Song.Language);

+

   for C := 0 to Length(Song.Edition)-1 do

     if Song.Edition[C]  <> 'Unknown' then WriteLn(SongFile, '#EDITION:' + Song.Edition[C]);

 

   for C := 0 to Length(Song.Genre) - 1 do

     if Song.Genre[C] <> 'Unknown' then   WriteLn(SongFile, '#GENRE:' + Song.Genre[C]);

-    

-  if Song.Language    <> 'Unknown' then    WriteLn(SongFile, '#LANGUAGE:'    + Song.Language);

+

+  if Song.Year    <> '' then    WriteLn(SongFile, '#YEAR:'    + Song.Year);

+

+

 

   WriteLn(SongFile, '#MP3:' + Song.Mp3);

 

@@ -1154,6 +1188,15 @@ begin
     WriteLn(SongFile, '#MedleyEndBeat:' + IntToStr(Song.Medley.EndBeat));

   end;

 

+  if (not Song.CalcMedley) then

+    WriteLn(SongFile, '#CalcMedley:Off');

+

+  {if (Song.isDuet) then

+  begin

+    WriteLn(SongFile, '#DuetSingerP1:' + Song.DuetNames[0]);

+    WriteLn(SongFile, '#DuetSingerP2:' + Song.DuetNames[1]);

+  end;}

+

   if Relative               then    WriteLn(SongFile, '#RELATIVE:yes');

 

   WriteLn(SongFile, '#BPM:' + FloatToStr(Song.BPM[0].BPM / 4));

@@ -1222,6 +1265,9 @@ begin
   if AktSong.Medley.Source = msTag then

     Exit;

 

+  if not AktSong.CalcMedley then

+    Exit;

+

   //relative is not supported for medley by now!

   if AktSong.Relative then

   begin