Some Themework done.

Added new Statics to PartyWin. [PartyWinStaticTeam(n)BG and Deco]
Fix: bug in PartyScore (esc skipped to PartyNewRound where PartyWin should come)
Disabled Esc in PartyWin. 
To do: Sing-Screen, Stats

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

3 files changed, 40 insertions, 4 deletions

diff --git a/Game/Code/Classes/UThemes.pas b/Game/Code/Classes/UThemes.pas
index ea2328f9..e8f8eb10 100644
--- a/Game/Code/Classes/UThemes.pas
+++ b/Game/Code/Classes/UThemes.pas
@@ -579,8 +579,14 @@ type
     TextNameTeam2:     TThemeText;

     TextNameTeam3:     TThemeText;

     StaticTeam1:       TThemeStatic;

+    StaticTeam1BG:     TThemeStatic;

+    StaticTeam1Deco:   TThemeStatic;

     StaticTeam2:       TThemeStatic;

+    StaticTeam2BG:     TThemeStatic;

+    StaticTeam2Deco:   TThemeStatic;

     StaticTeam3:       TThemeStatic;

+    StaticTeam3BG:     TThemeStatic;

+    StaticTeam3Deco:   TThemeStatic;

 

     TextWinner:        TThemeText;

   end;

@@ -1308,8 +1314,14 @@ begin
       ThemeLoadText (PartyWin.TextNameTeam3, 'PartyWinTextNameTeam3');

 

       ThemeLoadStatic (PartyWin.StaticTeam1, 'PartyWinStaticTeam1');

+      ThemeLoadStatic (PartyWin.StaticTeam1BG, 'PartyWinStaticTeam1BG');

+      ThemeLoadStatic (PartyWin.StaticTeam1Deco, 'PartyWinStaticTeam1Deco');

       ThemeLoadStatic (PartyWin.StaticTeam2, 'PartyWinStaticTeam2');

+      ThemeLoadStatic (PartyWin.StaticTeam2BG, 'PartyWinStaticTeam2BG');

+      ThemeLoadStatic (PartyWin.StaticTeam2Deco, 'PartyWinStaticTeam2Deco');

       ThemeLoadStatic (PartyWin.StaticTeam3, 'PartyWinStaticTeam3');

+      ThemeLoadStatic (PartyWin.StaticTeam3BG, 'PartyWinStaticTeam3BG');

+      ThemeLoadStatic (PartyWin.StaticTeam3Deco, 'PartyWinStaticTeam3Deco');

 

       ThemeLoadText (PartyWin.TextWinner, 'PartyWinTextWinner');

 

diff --git a/Game/Code/Screens/UScreenPartyScore.pas b/Game/Code/Screens/UScreenPartyScore.pas
index 4afaee09..324656c0 100644
--- a/Game/Code/Screens/UScreenPartyScore.pas
+++ b/Game/Code/Screens/UScreenPartyScore.pas
@@ -51,7 +51,7 @@ begin
       SDLK_ESCAPE :

         begin

           Music.PlayStart;

-          if (PartySession.CurRound <= High(PartySession.Rounds)) then

+          if (PartySession.CurRound < High(PartySession.Rounds)) then

             FadeTo(@ScreenPartyNewRound)

           else

           begin

diff --git a/Game/Code/Screens/UScreenPartyWin.pas b/Game/Code/Screens/UScreenPartyWin.pas
index ff65e82f..a6486f67 100644
--- a/Game/Code/Screens/UScreenPartyWin.pas
+++ b/Game/Code/Screens/UScreenPartyWin.pas
@@ -15,10 +15,16 @@ type
       TextNameTeam2:     Cardinal;

       TextNameTeam3:     Cardinal;

       StaticTeam1:       Cardinal;

+      StaticTeam1BG:     Cardinal;

+      StaticTeam1Deco:   Cardinal;

       StaticTeam2:       Cardinal;

+      StaticTeam2BG:     Cardinal;

+      StaticTeam2Deco:   Cardinal;

       StaticTeam3:       Cardinal;

+      StaticTeam3BG:     Cardinal;

+      StaticTeam3Deco:   Cardinal;

       TextWinner:        Cardinal;

-      

+

       constructor Create; override;

       function ParseInput(PressedKey: Cardinal; ScanCode: byte; PressedDown: Boolean): Boolean; override;

       procedure onShow; override;

@@ -40,11 +46,11 @@ begin
           Result := false;

         end;

 

-      SDLK_ESCAPE :

+      {SDLK_ESCAPE :

         begin

           Music.PlayStart;

           FadeTo(@ScreenMain);

-        end;

+        end;}

 

       SDLK_RETURN:

         begin

@@ -69,8 +75,14 @@ begin
   TextNameTeam3 := AddText (Theme.PartyWin.TextNameTeam3);

 

   StaticTeam1 := AddStatic (Theme.PartyWin.StaticTeam1);

+  StaticTeam1BG := AddStatic (Theme.PartyWin.StaticTeam1BG);

+  StaticTeam1Deco := AddStatic (Theme.PartyWin.StaticTeam1Deco);

   StaticTeam2 := AddStatic (Theme.PartyWin.StaticTeam2);

+  StaticTeam2BG := AddStatic (Theme.PartyWin.StaticTeam2BG);

+  StaticTeam2Deco := AddStatic (Theme.PartyWin.StaticTeam2Deco);

   StaticTeam3 := AddStatic (Theme.PartyWin.StaticTeam3);

+  StaticTeam3BG := AddStatic (Theme.PartyWin.StaticTeam3BG);

+  StaticTeam3Deco := AddStatic (Theme.PartyWin.StaticTeam3Deco);

 

   TextWinner := AddText (Theme.PartyWin.TextWinner);

 

@@ -93,12 +105,16 @@ begin
     Text[TextScoreTeam1].Visible := True;

     Text[TextNameTeam1].Visible := True;

     Static[StaticTeam1].Visible := True;

+    Static[StaticTeam1BG].Visible := True;

+    Static[StaticTeam1Deco].Visible := True;

   end

   else

   begin

     Text[TextScoreTeam1].Visible := False;

     Text[TextNameTeam1].Visible := False;

     Static[StaticTeam1].Visible := False;

+    Static[StaticTeam1BG].Visible := False;

+    Static[StaticTeam1Deco].Visible := False;

   end;

 

   if (PartySession.Teams.NumTeams >= 2) then

@@ -109,12 +125,16 @@ begin
     Text[TextScoreTeam2].Visible := True;

     Text[TextNameTeam2].Visible := True;

     Static[StaticTeam2].Visible := True;

+    Static[StaticTeam2BG].Visible := True;

+    Static[StaticTeam2Deco].Visible := True;

   end

   else

   begin

     Text[TextScoreTeam2].Visible := False;

     Text[TextNameTeam2].Visible := False;

     Static[StaticTeam2].Visible := False;

+    Static[StaticTeam2BG].Visible := False;

+    Static[StaticTeam2Deco].Visible := False;

   end;

 

   if (PartySession.Teams.NumTeams >= 3) then

@@ -125,12 +145,16 @@ begin
     Text[TextScoreTeam3].Visible := True;

     Text[TextNameTeam3].Visible := True;

     Static[StaticTeam3].Visible := True;

+    Static[StaticTeam3BG].Visible := True;

+    Static[StaticTeam3Deco].Visible := True;

   end

   else

   begin

     Text[TextScoreTeam3].Visible := False;

     Text[TextNameTeam3].Visible := False;

     Static[StaticTeam3].Visible := False;

+    Static[StaticTeam3BG].Visible := False;

+    Static[StaticTeam3Deco].Visible := False;

   end;