Deleted Motas Methods to display variable Statics and Texts in Party Mode.

Added a new, more extendable and easier in Code Method for displaying Statics in Party Mode or in Normal Mode only
Enter in Songscreen in Party Mode Opens now SongMenu again when PartyPopup=1
Changed Theme to Fit these changes

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@206 b956fd51-792f-4845-bead-9b4dfca2ff2c

1 files changed, 14 insertions, 75 deletions

diff --git a/Game/Code/Classes/UThemes.pas b/Game/Code/Classes/UThemes.pas
index 24ac0eaa..0fe207e9 100644
--- a/Game/Code/Classes/UThemes.pas
+++ b/Game/Code/Classes/UThemes.pas
@@ -280,6 +280,13 @@ type
       ColR, ColG, ColB: Real;

       end;

 

+    //Party and Non Party specific Statics and Texts

+    StaticParty:    AThemeStatic;

+    TextParty:      AThemeText;

+

+    StaticNonParty: AThemeStatic;

+    TextNonParty:   AThemeText;

+

     //Party Mode

     StaticTeam1Joker1: TThemeStatic;

     StaticTeam1Joker2: TThemeStatic;

@@ -296,41 +303,6 @@ type
     StaticTeam3Joker3: TThemeStatic;

     StaticTeam3Joker4: TThemeStatic;

     StaticTeam3Joker5: TThemeStatic;

-

-    StaticKeys1      : TThemeStatic;

-    TextKeys1        : TThemeText;

-    StaticKeys1Party : TThemeStatic;

-    TextKeys1Party   : TThemeText;

-    StaticKeys2      : TThemeStatic;

-    TextKeys2        : TThemeText;

-    StaticKeys2Party : TThemeStatic;

-    TextKeys2Party   : TThemeText;

-    StaticKeys3      : TThemeStatic;

-    TextKeys3        : TThemeText;

-    StaticKeys3Party : TThemeStatic;

-    TextKeys3Party   : TThemeText;

-    StaticKeys4      : TThemeStatic;

-    TextKeys4        : TThemeText;

-    StaticKeys4Party : TThemeStatic;

-    TextKeys4Party   : TThemeText;

-    StaticKeys5      : TThemeStatic;

-    TextKeys5        : TThemeText;

-    StaticKeys5Party : TThemeStatic;

-    TextKeys5Party   : TThemeText;

-    StaticKeys6      : TThemeStatic;

-    TextKeys6        : TThemeText;

-    StaticKeys6Party : TThemeStatic;

-    TextKeys6Party   : TThemeText;

-    StaticKeys7      : TThemeStatic;

-    TextKeys7        : TThemeText;

-    StaticKeys7Party : TThemeStatic;

-    TextKeys7Party   : TThemeText;

-    StaticKeys8      : TThemeStatic;

-    TextKeys8        : TThemeText;

-    StaticKeys8Party : TThemeStatic;

-    TextKeys8Party   : TThemeText;

-

-

   end;

 

    TThemeSing = class(TThemeBasic)

@@ -1022,6 +994,13 @@ begin
       end;

       //Load Equalizer Pos and Size from Theme Mod End

 

+      //Party and Non Party specific Statics and Texts

+      ThemeLoadStatics (Song.StaticParty, 'SongStaticParty');

+      ThemeLoadTexts (Song.TextParty, 'SongTextParty');

+

+      ThemeLoadStatics (Song.StaticNonParty, 'SongStaticNonParty');

+      ThemeLoadTexts (Song.TextNonParty, 'SongTextNonParty');

+

       //Party Mode

       ThemeLoadStatic(Song.StaticTeam1Joker1, 'SongStaticTeam1Joker1');

       ThemeLoadStatic(Song.StaticTeam1Joker2, 'SongStaticTeam1Joker2');

@@ -1041,46 +1020,6 @@ begin
       ThemeLoadStatic(Song.StaticTeam3Joker4, 'SongStaticTeam3Joker4');

       ThemeLoadStatic(Song.StaticTeam3Joker5, 'SongStaticTeam3Joker5');

 

-      ThemeLoadStatic(Song.StaticKeys1, 'SongStaticKeys1');

-      ThemeLoadText(Song.TextKeys1, 'SongStaticKeys1Text');

-      ThemeLoadStatic(Song.StaticKeys1Party, 'SongStaticKeys1Party');

-      ThemeLoadText(Song.TextKeys1Party, 'SongStaticKeys1TextParty');

-

-      ThemeLoadStatic(Song.StaticKeys2, 'SongStaticKeys2');

-      ThemeLoadText(Song.TextKeys2, 'SongStaticKeys2Text');

-      ThemeLoadStatic(Song.StaticKeys2Party, 'SongStaticKeys2Party');

-      ThemeLoadText(Song.TextKeys2Party, 'SongStaticKeys2TextParty');

-

-      ThemeLoadStatic(Song.StaticKeys3, 'SongStaticKeys3');

-      ThemeLoadText(Song.TextKeys3, 'SongStaticKeys3Text');

-      ThemeLoadStatic(Song.StaticKeys3Party, 'SongStaticKeys3Party');

-      ThemeLoadText(Song.TextKeys3Party, 'SongStaticKeys3TextParty');

-

-      ThemeLoadStatic(Song.StaticKeys4, 'SongStaticKeys4');

-      ThemeLoadText(Song.TextKeys4, 'SongStaticKeys4Text');

-      ThemeLoadStatic(Song.StaticKeys4Party, 'SongStaticKeys4Party');

-      ThemeLoadText(Song.TextKeys4Party, 'SongStaticKeys4TextParty');

-

-      ThemeLoadStatic(Song.StaticKeys5, 'SongStaticKeys5');

-      ThemeLoadText(Song.TextKeys5, 'SongStaticKeys5Text');

-      ThemeLoadStatic(Song.StaticKeys5Party, 'SongStaticKeys5Party');

-      ThemeLoadText(Song.TextKeys5Party, 'SongStaticKeys5TextParty');

-

-      ThemeLoadStatic(Song.StaticKeys6, 'SongStaticKeys6');

-      ThemeLoadText(Song.TextKeys6, 'SongStaticKeys6Text');

-      ThemeLoadStatic(Song.StaticKeys6Party, 'SongStaticKeys6Party');

-      ThemeLoadText(Song.TextKeys6Party, 'SongStaticKeys6TextParty');

-

-      ThemeLoadStatic(Song.StaticKeys7, 'SongStaticKeys7');

-      ThemeLoadText(Song.TextKeys7, 'SongStaticKeys7Text');

-      ThemeLoadStatic(Song.StaticKeys7Party, 'SongStaticKeys7Party');

-      ThemeLoadText(Song.TextKeys7Party, 'SongStaticKeys7TextParty');

-

-      ThemeLoadStatic(Song.StaticKeys8, 'SongStaticKeys8');

-      ThemeLoadText(Song.TextKeys8, 'SongStaticKeys8Text');

-      ThemeLoadStatic(Song.StaticKeys8Party, 'SongStaticKeys8Party');

-      ThemeLoadText(Song.TextKeys8Party, 'SongStaticKeys8TextParty');

-

       // Sing

       ThemeLoadBasic(Sing, 'Sing');