all screens now inherit their OnShow

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

32 files changed, 62 insertions, 4 deletions

diff --git a/Game/Code/Screens/UScreenCredits.pas b/Game/Code/Screens/UScreenCredits.pas
index 925d62cc..4855c9b9 100644
--- a/Game/Code/Screens/UScreenCredits.pas
+++ b/Game/Code/Screens/UScreenCredits.pas
@@ -283,6 +283,8 @@ end;
 

 procedure TScreenCredits.onShow;

 begin

+  inherited;

+

   CRDTS_Stage:=InitialDelay;

   Credits_X := 580;

   deluxe_slidein := 0;

diff --git a/Game/Code/Screens/UScreenEdit.pas b/Game/Code/Screens/UScreenEdit.pas
index 00feddbf..3275222b 100644
--- a/Game/Code/Screens/UScreenEdit.pas
+++ b/Game/Code/Screens/UScreenEdit.pas
@@ -93,6 +93,8 @@ end;
 

 procedure TScreenEdit.onShow;

 begin

+  inherited;

+

 //  Interaction := 0;

 end;

 

diff --git a/Game/Code/Screens/UScreenEditConvert.pas b/Game/Code/Screens/UScreenEditConvert.pas
index 304c2259..16717419 100644
--- a/Game/Code/Screens/UScreenEditConvert.pas
+++ b/Game/Code/Screens/UScreenEditConvert.pas
@@ -416,6 +416,8 @@ var
   C:    integer; // channel
   CN:   integer; // channel note
 begin
+  inherited;
+
 {$IFDEF UseMIDIPort}
   MidiOut := TMidiOutput.Create(nil);
   if Ini.Debug = 1 then
diff --git a/Game/Code/Screens/UScreenEditHeader.pas b/Game/Code/Screens/UScreenEditHeader.pas
index 60466a27..440db00e 100644
--- a/Game/Code/Screens/UScreenEditHeader.pas
+++ b/Game/Code/Screens/UScreenEditHeader.pas
@@ -208,6 +208,8 @@ end;
 

 procedure TScreenEditHeader.onShow;

 begin

+  inherited;

+

 {  if FileExists(FileName) then begin // load file

     AktSong.FileName := FileName;

     SkanujPlik(AktSong);

diff --git a/Game/Code/Screens/UScreenEditSub.pas b/Game/Code/Screens/UScreenEditSub.pas
index 689a12d9..f4a2e40b 100644
--- a/Game/Code/Screens/UScreenEditSub.pas
+++ b/Game/Code/Screens/UScreenEditSub.pas
@@ -1159,6 +1159,8 @@ end;
 
 procedure TScreenEditSub.onShow;
 begin
+  inherited;
+
   Log.LogStatus('Initializing', 'TEditScreen.onShow');
   Lyric := TLyric.Create;
 
@@ -1281,7 +1283,7 @@ begin
         for Pet := 0 to Czesci[0].Czesc[Czesci[0].Akt].HighNut do
           if (Czesci[0].Czesc[Czesci[0].Akt].Nuta[Pet].Start = AktBeat) then
           begin
-            AudioPlayback.PlaySound(SoundLib.Click);
+            AudioPlayback.PlaySound( SoundLib.Click );
             LastClick := AktBeat;
           end;
       end;
diff --git a/Game/Code/Screens/UScreenLevel.pas b/Game/Code/Screens/UScreenLevel.pas
index 16e24027..d1910d5f 100644
--- a/Game/Code/Screens/UScreenLevel.pas
+++ b/Game/Code/Screens/UScreenLevel.pas
@@ -80,6 +80,8 @@ end;
 

 procedure TScreenLevel.onShow;

 begin

+  inherited;

+

   Interaction := Ini.Difficulty;

 

 //  LCD.WriteText(1, '  Choose mode:  ');

diff --git a/Game/Code/Screens/UScreenLoading.pas b/Game/Code/Screens/UScreenLoading.pas
index 63b25d2c..e28f83cf 100644
--- a/Game/Code/Screens/UScreenLoading.pas
+++ b/Game/Code/Screens/UScreenLoading.pas
@@ -46,7 +46,7 @@ end;
 
 procedure TScreenLoading.onShow;
 begin
-// nothing
+  inherited;
 end;
 
 function TScreenLoading.GetBGTexNum: GLUInt;
diff --git a/Game/Code/Screens/UScreenOpen.pas b/Game/Code/Screens/UScreenOpen.pas
index 5d78fb31..5b35c39d 100644
--- a/Game/Code/Screens/UScreenOpen.pas
+++ b/Game/Code/Screens/UScreenOpen.pas
@@ -145,6 +145,8 @@ end;
 

 procedure TScreenOpen.onShow;

 begin

+  inherited;

+

   Interaction := 0;

 end;

 

diff --git a/Game/Code/Screens/UScreenOptions.pas b/Game/Code/Screens/UScreenOptions.pas
index 4e39fe21..8c5e67df 100644
--- a/Game/Code/Screens/UScreenOptions.pas
+++ b/Game/Code/Screens/UScreenOptions.pas
@@ -147,7 +147,7 @@ end;
 

 procedure TScreenOptions.onShow;

 begin

-//

+  inherited;

 end;

 

 procedure TScreenOptions.InteractNext;

diff --git a/Game/Code/Screens/UScreenOptionsAdvanced.pas b/Game/Code/Screens/UScreenOptionsAdvanced.pas
index e2c30bf1..7ca0fc05 100644
--- a/Game/Code/Screens/UScreenOptionsAdvanced.pas
+++ b/Game/Code/Screens/UScreenOptionsAdvanced.pas
@@ -99,6 +99,8 @@ end;
 

 procedure TScreenOptionsAdvanced.onShow;

 begin

+  inherited;

+

   Interaction := 0;

 end;

 

diff --git a/Game/Code/Screens/UScreenOptionsGame.pas b/Game/Code/Screens/UScreenOptionsGame.pas
index 15b538a5..394b28a2 100644
--- a/Game/Code/Screens/UScreenOptionsGame.pas
+++ b/Game/Code/Screens/UScreenOptionsGame.pas
@@ -106,6 +106,8 @@ end;
 

 procedure TScreenOptionsGame.onShow;

 begin

+  inherited;

+

 //  Interaction := 0;

 end;

 

diff --git a/Game/Code/Screens/UScreenOptionsGraphics.pas b/Game/Code/Screens/UScreenOptionsGraphics.pas
index 4ceeeb32..607501f1 100644
--- a/Game/Code/Screens/UScreenOptionsGraphics.pas
+++ b/Game/Code/Screens/UScreenOptionsGraphics.pas
@@ -93,6 +93,8 @@ end;
 

 procedure TScreenOptionsGraphics.onShow;

 begin

+  inherited;

+

   Interaction := 0;

 end;

 

diff --git a/Game/Code/Screens/UScreenOptionsLyrics.pas b/Game/Code/Screens/UScreenOptionsLyrics.pas
index 7275efed..b3e6b5f2 100644
--- a/Game/Code/Screens/UScreenOptionsLyrics.pas
+++ b/Game/Code/Screens/UScreenOptionsLyrics.pas
@@ -88,6 +88,8 @@ end;
 

 procedure TScreenOptionsLyrics.onShow;

 begin

+  inherited;

+

   Interaction := 0;

 end;

 

diff --git a/Game/Code/Screens/UScreenOptionsRecord.pas b/Game/Code/Screens/UScreenOptionsRecord.pas
index 130c3551..b6fb588e 100644
--- a/Game/Code/Screens/UScreenOptionsRecord.pas
+++ b/Game/Code/Screens/UScreenOptionsRecord.pas
@@ -134,6 +134,8 @@ end;
 

 procedure TScreenOptionsRecord.onShow;

 begin

+  inherited;

+

   Interaction := 0;

   writeln( 'AudioInput.CaptureStart') ;

 

diff --git a/Game/Code/Screens/UScreenOptionsSound.pas b/Game/Code/Screens/UScreenOptionsSound.pas
index da5c6e90..6fe50793 100644
--- a/Game/Code/Screens/UScreenOptionsSound.pas
+++ b/Game/Code/Screens/UScreenOptionsSound.pas
@@ -93,6 +93,8 @@ end;
 

 procedure TScreenOptionsSound.onShow;

 begin

+  inherited;

+

   Interaction := 0;

 end;

 

diff --git a/Game/Code/Screens/UScreenOptionsThemes.pas b/Game/Code/Screens/UScreenOptionsThemes.pas
index 239f98fe..4e94a09a 100644
--- a/Game/Code/Screens/UScreenOptionsThemes.pas
+++ b/Game/Code/Screens/UScreenOptionsThemes.pas
@@ -144,6 +144,8 @@ end;
 
 procedure TScreenOptionsThemes.onShow;
 begin
+  inherited;
+
   Interaction := 0;
 end;
 
diff --git a/Game/Code/Screens/UScreenPartyNewRound.pas b/Game/Code/Screens/UScreenPartyNewRound.pas
index 198708cc..bc7cf782 100644
--- a/Game/Code/Screens/UScreenPartyNewRound.pas
+++ b/Game/Code/Screens/UScreenPartyNewRound.pas
@@ -202,6 +202,8 @@ var
     Result := Language.Implode(Players);
   end;
 begin
+  inherited;
+
   // to-do : Party
   //PartySession.StartRound;
 
diff --git a/Game/Code/Screens/UScreenPartyOptions.pas b/Game/Code/Screens/UScreenPartyOptions.pas
index 1b5cf976..ed5a87e0 100644
--- a/Game/Code/Screens/UScreenPartyOptions.pas
+++ b/Game/Code/Screens/UScreenPartyOptions.pas
@@ -258,6 +258,8 @@ end;
 
 procedure TScreenPartyOptions.onShow;
 begin
+  inherited;
+
   Randomize;
 
 //  LCD.WriteText(1, '  Choose mode:  ');
diff --git a/Game/Code/Screens/UScreenPartyPlayer.pas b/Game/Code/Screens/UScreenPartyPlayer.pas
index 68f76952..d46fb2b6 100644
--- a/Game/Code/Screens/UScreenPartyPlayer.pas
+++ b/Game/Code/Screens/UScreenPartyPlayer.pas
@@ -252,6 +252,8 @@ procedure TScreenPartyPlayer.onShow;
 var

   I:    integer;

 begin

+  inherited;

+

   // Templates for Names Mod

   for I := 1 to 4 do

     Button[I].Text[0].Text := Ini.Name[I-1];

diff --git a/Game/Code/Screens/UScreenPartyScore.pas b/Game/Code/Screens/UScreenPartyScore.pas
index 6b21323b..aeffda8d 100644
--- a/Game/Code/Screens/UScreenPartyScore.pas
+++ b/Game/Code/Screens/UScreenPartyScore.pas
@@ -155,7 +155,11 @@ var
   I, J: Integer;

   Placings: Array [0..5] of Byte;

 begin

+  inherited;

+

+

   //Get Maxscore

+

   MaxScore := 0;

   for I := 0 to ScreenSingModi.PlayerInfo.NumPlayers - 1 do

   begin

diff --git a/Game/Code/Screens/UScreenPartyWin.pas b/Game/Code/Screens/UScreenPartyWin.pas
index 5960db06..91e0edc6 100644
--- a/Game/Code/Screens/UScreenPartyWin.pas
+++ b/Game/Code/Screens/UScreenPartyWin.pas
@@ -106,6 +106,8 @@ var
     Result := ColorExists(NameString);

   end;

 begin

+  inherited;

+

   // to-do : Party

   //Get Team Placing

   //Placing := PartySession.GetTeamOrder;

diff --git a/Game/Code/Screens/UScreenPopup.pas b/Game/Code/Screens/UScreenPopup.pas
index 402857a9..628aa556 100644
--- a/Game/Code/Screens/UScreenPopup.pas
+++ b/Game/Code/Screens/UScreenPopup.pas
@@ -131,7 +131,7 @@ end;
 

 procedure TScreenPopupCheck.onShow;

 begin

-

+  inherited;

 end;

 

 procedure TScreenPopupCheck.ShowPopup(msg: String);

@@ -214,6 +214,7 @@ end;
 

 procedure TScreenPopupError.onShow;

 begin

+  inherited;

 

 end;

 

diff --git a/Game/Code/Screens/UScreenScore.pas b/Game/Code/Screens/UScreenScore.pas
index c53844f5..bc86c66c 100644
--- a/Game/Code/Screens/UScreenScore.pas
+++ b/Game/Code/Screens/UScreenScore.pas
@@ -265,6 +265,7 @@ var
   Wsp:  real;
   ArrayStartModifier :integer;
 begin
+  inherited;
 
   case PlayersPlay of
     1:    begin
diff --git a/Game/Code/Screens/UScreenSing.pas b/Game/Code/Screens/UScreenSing.pas
index 1bf06a7f..2de44e19 100644
--- a/Game/Code/Screens/UScreenSing.pas
+++ b/Game/Code/Screens/UScreenSing.pas
@@ -329,6 +329,8 @@ var
 
   success:  boolean;
 begin
+  inherited;
+
   Log.LogStatus('Begin', 'onShow');
   FadeOut := false; // 0.5.0: early 0.5.0 problems were by this line commented
 
diff --git a/Game/Code/Screens/UScreenSingModi.pas b/Game/Code/Screens/UScreenSingModi.pas
index ed827ec8..9e48a9a7 100644
--- a/Game/Code/Screens/UScreenSingModi.pas
+++ b/Game/Code/Screens/UScreenSingModi.pas
@@ -170,6 +170,7 @@ procedure TScreenSingModi.onShow;
 var
   I: Integer;
 begin
+  inherited;
 
   PlayersPlay := TeamInfo.NumTeams;
 
diff --git a/Game/Code/Screens/UScreenSong.pas b/Game/Code/Screens/UScreenSong.pas
index b142b4dc..fbfeeb65 100644
--- a/Game/Code/Screens/UScreenSong.pas
+++ b/Game/Code/Screens/UScreenSong.pas
@@ -1507,6 +1507,8 @@ end;
 

 procedure TScreenSong.onShow;

 begin

+  inherited;

+

   AudioPlayback.Stop;

 

   if Ini.Players <= 3 then PlayersPlay := Ini.Players + 1;

diff --git a/Game/Code/Screens/UScreenSongJumpto.pas b/Game/Code/Screens/UScreenSongJumpto.pas
index dfa90009..1699e36f 100644
--- a/Game/Code/Screens/UScreenSongJumpto.pas
+++ b/Game/Code/Screens/UScreenSongJumpto.pas
@@ -145,6 +145,8 @@ end;
 

 procedure TScreenSongJumpto.onShow;

 begin

+  inherited;

+

   //Reset Screen if no Old Search is Displayed

   if (CatSongs.CatNumShow <> -2) then

   begin

diff --git a/Game/Code/Screens/UScreenSongMenu.pas b/Game/Code/Screens/UScreenSongMenu.pas
index ae0bc9ba..ee46a4a5 100644
--- a/Game/Code/Screens/UScreenSongMenu.pas
+++ b/Game/Code/Screens/UScreenSongMenu.pas
@@ -199,6 +199,7 @@ end;
 
 procedure TScreenSongMenu.onShow;
 begin
+  inherited;
 
 end;
 
diff --git a/Game/Code/Screens/UScreenStatDetail.pas b/Game/Code/Screens/UScreenStatDetail.pas
index d793baf0..100a64d5 100644
--- a/Game/Code/Screens/UScreenStatDetail.pas
+++ b/Game/Code/Screens/UScreenStatDetail.pas
@@ -138,6 +138,8 @@ end;
 

 procedure TScreenStatDetail.onShow;

 begin

+  inherited;

+

   //Set Tot Entrys and PAges

   TotEntrys := DataBase.GetTotalEntrys(Typ);

   TotPages := Ceil(TotEntrys / Count);

diff --git a/Game/Code/Screens/UScreenStatMain.pas b/Game/Code/Screens/UScreenStatMain.pas
index 53154d6e..00c7bf37 100644
--- a/Game/Code/Screens/UScreenStatMain.pas
+++ b/Game/Code/Screens/UScreenStatMain.pas
@@ -141,6 +141,8 @@ end;
 
 procedure TScreenStatMain.onShow;
 begin
+  inherited;
+
   //Set Overview Text:
   SetOverview;
 end;
diff --git a/Game/Code/Screens/UScreenTop5.pas b/Game/Code/Screens/UScreenTop5.pas
index 207f6ee6..27881120 100644
--- a/Game/Code/Screens/UScreenTop5.pas
+++ b/Game/Code/Screens/UScreenTop5.pas
@@ -90,6 +90,8 @@ var
   I:      integer;
   PMax:   integer;
 begin
+  inherited;
+
   Fadeout := false;
 
   //ReadScore(CurrentSong);
diff --git a/Game/Code/Screens/UScreenWelcome.pas b/Game/Code/Screens/UScreenWelcome.pas
index fc088458..643f4295 100644
--- a/Game/Code/Screens/UScreenWelcome.pas
+++ b/Game/Code/Screens/UScreenWelcome.pas
@@ -56,6 +56,8 @@ end;
 

 procedure TScreenWelcome.onShow;

 begin

+  inherited;

+

   CountSkipTimeSet;

 end;