- fixed saving duets

- rewrite of DivideSentence and JoinSentence for duet mode
- rewrite of DivideNote for duet mode
- fixed score calculation for P2
- added more functions to the menu
- update of language files

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

1 files changed, 35 insertions, 12 deletions

diff --git a/Game/Code/Screens/UScreenSongJumpto.pas b/Game/Code/Screens/UScreenSongJumpto.pas
index c79fff65..f4d0d796 100644
--- a/Game/Code/Screens/UScreenSongJumpto.pas
+++ b/Game/Code/Screens/UScreenSongJumpto.pas
@@ -27,6 +27,10 @@ type
       function Draw: boolean; override;

 

       procedure SetTextFound(const Count: Cardinal);

+      procedure ToggleDuetFilter();

+      procedure SetDuetFilter();

+      procedure ResetDuetFilter();

+      procedure RefreshDuetFilter();

   end;

 

 var

@@ -106,18 +110,7 @@ begin
 

       SDLK_F1:

         begin

-          if not isDuet then

-          begin

-            //show/hide duet songs

-            isDuet := true;

-            Button[0].Text[0].Text := 'Duet Songs';

-            SetTextFound(CatSongs.SetFilter('', 3));

-          end else

-          begin

-            isDuet := false;

-            Button[0].Text[0].Text := '';

-            SetTextFound(CatSongs.SetFilter(Button[0].Text[0].Text, SelectType));

-          end;

+          ToggleDuetFilter;

         end;

 

       SDLK_RETURN,

@@ -269,4 +262,34 @@ begin
   end;

 end;

 

+procedure TScreenSongJumpto.ToggleDuetFilter;

+begin

+  if not isDuet then

+    SetDuetFilter

+  else

+    ResetDuetFilter;

+end;

+

+procedure TScreenSongJumpto.SetDuetFilter;

+begin

+  isDuet := true;

+  Button[0].Text[0].Text := 'Duet Songs';

+  SetTextFound(CatSongs.SetFilter('', 3));

+end;

+

+procedure TScreenSongJumpto.ResetDuetFilter;

+begin

+  isDuet := false;

+  Button[0].Text[0].Text := '';

+  SetTextFound(CatSongs.SetFilter(Button[0].Text[0].Text, SelectType));

+end;

+

+procedure TScreenSongJumpto.RefreshDuetFilter;

+begin

+  if isDuet then

+    SetDuetFilter

+  else

+    ResetDuetFilter;

+end;

+

 end.