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

1 files changed, 4 insertions, 3 deletions

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;