- 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, 11 insertions, 3 deletions

diff --git a/Game/Code/Classes/UIni.pas b/Game/Code/Classes/UIni.pas
index 0f1b26ce..97030d1d 100644
--- a/Game/Code/Classes/UIni.pas
+++ b/Game/Code/Classes/UIni.pas
@@ -19,7 +19,9 @@ type
     Difficulty:     integer;

     Language:       integer;

     Tabs:           integer;

+    tabs_temp:      integer;

     Sorting:        integer;

+    sorting_temp:   integer;

     ShuffleTime:    integer;

     Debug:          integer;

     LoadFaultySongs:integer;

@@ -108,7 +110,7 @@ const
   IDifficulty:    array[0..2] of string = ('Easy', 'Medium', 'Hard');

   ITabs:          array[0..1] of string = ('Off', 'On');

 

-  ISorting:       array[0..7] of string = ('Edition', 'Genre', 'Language', 'Folder', 'Title', 'Artist', 'Title2', 'Artist2');

+  ISorting:       array[0..8] of string = ('Edition', 'Genre', 'Language', 'Folder', 'Title', 'Artist', 'Title2', 'Artist2', 'Random');

   sEdition = 0;

   sGenre = 1;

   sLanguage = 2;

@@ -117,8 +119,9 @@ const
   sArtist = 5;

   sTitle2 = 6;

   sArtist2 = 7;

+  sRandom = 8;

 

-  IShuffleTime:   array[0..9] of string = ('Off',

+  IShuffleTime:   array[0..10] of string = ('Off',

                                           '15 Sec',

                                           '30 Sec',

                                           '45 Sec',

@@ -127,7 +130,8 @@ const
                                           '90 Sec',

                                           '105 Sec',

                                           '120 Sec',

-                                          'MAX');

+                                          'MAX',

+                                          'FULL');

 

   IDebug:         array[0..1] of string = ('Off', 'On');

   ILoadFaultySongs: array[0..1] of string = ('Off', 'On');

@@ -248,11 +252,13 @@ begin
   Tekst := IniFile.ReadString('Game', 'Tabs', ITabs[0]);

   for Pet := 0 to High(ITabs) do

     if Tekst = ITabs[Pet] then Ini.Tabs := Pet;

+  tabs_temp := Tabs;

 

   // Sorting

   Tekst := IniFile.ReadString('Game', 'Sorting', ISorting[0]);

   for Pet := 0 to High(ISorting) do

     if Tekst = ISorting[Pet] then Ini.Sorting := Pet;

+  sorting_temp := Sorting;

 

   // ShuffleTime

   Tekst := IniFile.ReadString('Game', 'ShuffleTime', 'Off');

@@ -653,10 +659,12 @@ begin
     // Tabs

     Tekst := ITabs[Ini.Tabs];

     IniFile.WriteString('Game',     'Tabs',   Tekst);

+    tabs_temp := Tabs;

 

     // Sorting

     Tekst := ISorting[Ini.Sorting];

     IniFile.WriteString('Game',     'Sorting',   Tekst);

+    sorting_temp := Sorting;

 

     //ShuffleTime

     Tekst := IShuffleTime[Ini.ShuffleTime];