UScreenSing.pas, UScreenSingModi.pas: removed Uffmpeg and USmpeg, added UVideo

UGraphic.pas: prepared for possible loading animation
UGraphicClasses.pas, ULCD.pas, ULight.pas, UMain.pas, USkins.pas, UDisplay.pas, UMenuButton.pas, UMenuSelect.pas, UMenuSelectSlide.pas, UMenuStatic.pas, UScreenCredits.pas, UScreenEditSub.pas, UScreenOpen.pas, UScreenPopup.pas: some fixes to get rid of some compiler infos/warnings

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

6 files changed, 21 insertions, 30 deletions

diff --git a/Game/Code/Screens/UScreenCredits.pas b/Game/Code/Screens/UScreenCredits.pas
index deaa042e..067414bd 100644
--- a/Game/Code/Screens/UScreenCredits.pas
+++ b/Game/Code/Screens/UScreenCredits.pas
@@ -165,6 +165,7 @@ end;
 function TScreenCredits.Draw: boolean;

 begin

   DrawCredits;

+  Draw:=true;

 end;

 

 procedure TScreenCredits.onShow;

@@ -187,7 +188,7 @@ end;
 

 Procedure TScreenCredits.Draw_FunkyText;

 var

-  S,I, Len: Integer;

+  S: Integer;

   X,Y,A: Real;

   visibleText: PChar;

 begin

@@ -208,6 +209,7 @@ begin
     for S := 0 to length(visibleText)-1 do begin

       Y:=abs(sin((Credits_X+X)*0.93{*(((Credits_X+X))/1200)}/100*pi));

       SetFontPos(Credits_X+X,538-Y*(Credits_X+X)*(Credits_X+X)*(Credits_X+X)/1000000);

+      A:=0;

       if (Credits_X+X < 15) then A:=0;

       if (Credits_X+X >=15) then A:=Credits_X+X-15;

       if Credits_X+X > 32 then A:=17;

@@ -488,7 +490,6 @@ Data := Music.GetFFTData;
       if Data[k]>0.25 then ESC_Alpha:=5 else inc(ESC_Alpha);

       if ESC_Alpha >20 then ESC_Alpha:=20;

       if ((CTime-STime)<20) then ESC_Alpha:=20;

-      k:=CTime-STime;

       if CTime <=STime+10 then j:=CTime-STime else j:=10;

       if (CTime >=STime+Delay-10) then if (CTime <=STime+Delay) then j:=(STime+Delay)-CTime else j:=0;

       glColor4f(1, 1, 1, ESC_Alpha/20*j/10);

@@ -511,7 +512,7 @@ Data := Music.GetFFTData;
       gltranslatef(223,0,0);

       if CTime >=STime+Delay-10 then if CTime <=STime+Delay then begin

         gltranslatef(223,0,0);

-        glrotatef((CTime-(STime+Delay-10))*-9,0,0,1);

+        glrotatef((integer(CTime)-(integer(STime+Delay)-10))*-9,0,0,1);

         gltranslatef(-223,0,0);

       end;

       glBindTexture(GL_TEXTURE_2D, credits_blindguard.TexNum);

@@ -541,7 +542,6 @@ Data := Music.GetFFTData;
       if Data[k]>0.25 then ESC_Alpha:=5 else inc(ESC_Alpha);

       if ESC_Alpha >20 then ESC_Alpha:=20;

       if ((CTime-STime)<20) then ESC_Alpha:=20;

-      k:=CTime-STime;

       if CTime <=STime+10 then j:=CTime-STime else j:=10;

       if (CTime >=STime+Delay-10) then if (CTime <=STime+Delay) then j:=(STime+Delay)-CTime else j:=0;

       glColor4f(1, 1, 1, ESC_Alpha/20*j/10);

@@ -599,7 +599,6 @@ Data := Music.GetFFTData;
       if Data[k]>0.25 then ESC_Alpha:=5 else inc(ESC_Alpha);

       if ESC_Alpha >20 then ESC_Alpha:=20;

       if ((CTime-STime)<20) then ESC_Alpha:=20;

-      k:=CTime-STime;

       if CTime <=STime+10 then j:=CTime-STime else j:=10;

       if (CTime >=STime+Delay-10) then if (CTime <=STime+Delay) then j:=(STime+Delay)-CTime else j:=0;

       glColor4f(1, 1, 1, ESC_Alpha/20*j/10);

@@ -652,7 +651,6 @@ Data := Music.GetFFTData;
       if Data[k]>0.25 then ESC_Alpha:=5 else inc(ESC_Alpha);

       if ESC_Alpha >20 then ESC_Alpha:=20;

       if ((CTime-STime)<20) then ESC_Alpha:=20;

-      k:=CTime-STime;

       if CTime <=STime+10 then j:=CTime-STime else j:=10;

       if (CTime >=STime+Delay-10) then if (CTime <=STime+Delay) then j:=(STime+Delay)-CTime else j:=0;

       glColor4f(1, 1, 1, ESC_Alpha/20*j/10);

@@ -675,12 +673,11 @@ Data := Music.GetFFTData;
         f:=258.0-25.8*(CTime-STime)

       else

         f:=0;

-

+      g:=0;

       if CTime >=STime+Delay-10 then if CTime <=STime+Delay then begin

         j:=CTime-(STime+Delay-10);

         g:=32.6*j;

-      end else

-        g:=0;

+      end;

       glBindTexture(GL_TEXTURE_2D, credits_commandio.TexNum);

       glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);

       glEnable(GL_BLEND);

@@ -742,7 +739,6 @@ Data := Music.GetFFTData;
       if Data[k]>0.25 then ESC_Alpha:=5 else inc(ESC_Alpha);

       if ESC_Alpha >20 then ESC_Alpha:=20;

       if ((CTime-STime)<20) then ESC_Alpha:=20;

-      k:=CTime-STime;

       if CTime <=STime+10 then j:=CTime-STime else j:=10;

       if (CTime >=STime+Delay-10) then if (CTime <=STime+Delay) then j:=(STime+Delay)-CTime else j:=0;

       glColor4f(1, 1, 1, ESC_Alpha/20*j/10);

@@ -766,11 +762,11 @@ Data := Music.GetFFTData;
       else

         f:=0;

 

+      g:=0;

       if CTime >=STime+Delay-10 then if CTime <=STime+Delay then begin

         j:=CTime-(STime+Delay-10);

         g:=32.6*j;

-      end else

-        g:=0;

+      end;

       glBindTexture(GL_TEXTURE_2D, credits_mog.TexNum);

       glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);

       glEnable(GL_BLEND);

@@ -798,7 +794,6 @@ Data := Music.GetFFTData;
       if Data[k]>0.25 then ESC_Alpha:=5 else inc(ESC_Alpha);

       if ESC_Alpha >20 then ESC_Alpha:=20;

       if ((CTime-STime)<20) then ESC_Alpha:=20;

-      k:=CTime-STime;

       if CTime <=STime+10 then j:=CTime-STime else j:=10;

       if (CTime >=STime+Delay-10) then if (CTime <=STime+Delay) then j:=(STime+Delay)-CTime else j:=0;

       glColor4f(1, 1, 1, ESC_Alpha/20*j/10);

@@ -856,7 +851,6 @@ Data := Music.GetFFTData;
       if Data[k]>0.25 then ESC_Alpha:=5 else inc(ESC_Alpha);

       if ESC_Alpha >20 then ESC_Alpha:=20;

       if ((CTime-STime)<20) then ESC_Alpha:=20;

-      k:=CTime-STime;

       if CTime <=STime+10 then j:=CTime-STime else j:=10;

       if (CTime >=STime+Delay-10) then if (CTime <=STime+Delay) then j:=(STime+Delay)-CTime else j:=0;

       glColor4f(1, 1, 1, ESC_Alpha/20*j/10);

@@ -882,9 +876,8 @@ Data := Music.GetFFTData;
       end;

       if CTime >=STime+Delay-10 then if CTime <=STime+Delay then begin

         j:=CTime-(STime+Delay-10);

-        f:=j*10.0;

         gltranslatef(0,-223,0);

-        glrotatef(j*-9,0,0,1);

+        glrotatef(integer(j)*-9,0,0,1);

         gltranslatef(0,223,0);

         glrotatef(j*9,0,0,1);

       end;

@@ -915,7 +908,6 @@ Data := Music.GetFFTData;
       if Data[k]>0.25 then ESC_Alpha:=5 else inc(ESC_Alpha);

       if ESC_Alpha >20 then ESC_Alpha:=20;

       if ((CTime-STime)<20) then ESC_Alpha:=20;

-      k:=CTime-STime;

       if CTime <=STime+10 then j:=CTime-STime else j:=10;

       if (CTime >=STime+Delay-10) then if (CTime <=STime+Delay) then j:=(STime+Delay)-CTime else j:=0;

       glColor4f(1, 1, 1, ESC_Alpha/20*j/10);

diff --git a/Game/Code/Screens/UScreenEditSub.pas b/Game/Code/Screens/UScreenEditSub.pas
index 948ff2cc..6eef8509 100644
--- a/Game/Code/Screens/UScreenEditSub.pas
+++ b/Game/Code/Screens/UScreenEditSub.pas
@@ -2,7 +2,7 @@ unit UScreenEditSub;
 

 interface

 

-uses UMenu, UMusic, SDL, SysUtils, UFiles, UTime, USongs, UIni, ULog, USmpeg, UTexture, UMenuText,

+uses UMenu, UMusic, SDL, SysUtils, UFiles, UTime, USongs, UIni, ULog, UTexture, UMenuText,

   ULyrics, Math, OpenGL12, UThemes, MidiOut;

 

 type

diff --git a/Game/Code/Screens/UScreenOpen.pas b/Game/Code/Screens/UScreenOpen.pas
index 68667d87..c27ee762 100644
--- a/Game/Code/Screens/UScreenOpen.pas
+++ b/Game/Code/Screens/UScreenOpen.pas
@@ -2,7 +2,7 @@ unit UScreenOpen;
 

 interface

 

-uses UMenu, UMusic, SDL, SysUtils, UFiles, UTime, USongs, UIni, ULog, USmpeg, UTexture, UMenuText,

+uses UMenu, UMusic, SDL, SysUtils, UFiles, UTime, USongs, UIni, ULog, UTexture, UMenuText,

   ULyrics, Math, OpenGL12, UThemes;

 

 type

diff --git a/Game/Code/Screens/UScreenPopup.pas b/Game/Code/Screens/UScreenPopup.pas
index f583eb90..cc1b4492 100644
--- a/Game/Code/Screens/UScreenPopup.pas
+++ b/Game/Code/Screens/UScreenPopup.pas
@@ -19,8 +19,8 @@ type
 

 type

   TScreenPopupError = class(TMenu)

-    private

-      CurMenu: Byte; //Num of the cur. Shown Menu

+{    private

+      CurMenu: Byte; //Num of the cur. Shown Menu}

     public

       Visible: Boolean; //Whether the Menu should be Drawn

 

@@ -124,7 +124,7 @@ end;
 

 function TScreenPopupCheck.Draw: boolean;

 begin

-  inherited Draw;

+  Draw:=inherited Draw;

 end;

 

 procedure TScreenPopupCheck.onShow;

@@ -207,7 +207,7 @@ end;
 

 function TScreenPopupError.Draw: boolean;

 begin

-  inherited Draw;

+  Draw:=inherited Draw;

 end;

 

 procedure TScreenPopupError.onShow;

@@ -216,12 +216,10 @@ begin
 end;

 

 procedure TScreenPopupError.onHide;

-var i: integer;

 begin

 end;

 

 procedure TScreenPopupError.ShowPopup(msg: String);

-var i: integer;

 begin

   Interaction := 0; //Reset Interaction

   Visible := True;  //Set Visible

diff --git a/Game/Code/Screens/UScreenSing.pas b/Game/Code/Screens/UScreenSing.pas
index 8291a430..7a585cef 100644
--- a/Game/Code/Screens/UScreenSing.pas
+++ b/Game/Code/Screens/UScreenSing.pas
@@ -3,7 +3,7 @@ unit UScreenSing;
 interface

 

 uses UMenu, UMusic, SDL, SysUtils, UFiles, UTime, USongs, UIni, ULog, USmpeg, UTexture, ULyrics,

-  TextGL, OpenGL12, BASS, UThemes, ULCD, UGraphicClasses, Uffmpeg;

+  TextGL, OpenGL12, BASS, UThemes, ULCD, UGraphicClasses, UVideo;

 

 type

   TScreenSing = class(TMenu)

@@ -224,7 +224,7 @@ begin
 

   LyricMain := TLyric.Create;

   LyricSub :=  TLyric.Create;

-  Uffmpeg.Init;

+  UVideo.Init;

 end;

 

 procedure TScreenSing.onShow;

diff --git a/Game/Code/Screens/UScreenSingModi.pas b/Game/Code/Screens/UScreenSingModi.pas
index e046e193..0305315f 100644
--- a/Game/Code/Screens/UScreenSingModi.pas
+++ b/Game/Code/Screens/UScreenSingModi.pas
@@ -2,7 +2,7 @@ unit UScreenSingModi;
 

 interface

 

-uses UMenu, UMusic, SDL, SysUtils, UFiles, UTime, USongs, UIni, ULog, USmpeg, UTexture, ULyrics,

+uses UMenu, UMusic, SDL, SysUtils, UFiles, UTime, USongs, UIni, ULog, UTexture, ULyrics,

   TextGL, OpenGL12, BASS, UThemes, ULCD, UScreenSing, ModiSDK;

 

 type

@@ -943,10 +943,11 @@ end;
   if (DllMan.Selected.LoadSong) AND (DllMan.Selected.LoadBack) then

     SingDrawBackground;

 

+  // comment by blindy: wo zum henker wird denn in diesem screen ein video abgespielt?

   // update and draw movie

-  if ShowFinish and AktSong.VideoLoaded AND DllMan.Selected.LoadVideo then begin

+{  if ShowFinish and AktSong.VideoLoaded AND DllMan.Selected.LoadVideo then begin

     UpdateSmpeg; // this only draws

-  end;

+  end;}

 

   // draw static menu (FG)

   DrawFG;