merged r1830 trunk (current) in this branch

add some files to svn:ignore


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

1 files changed, 11 insertions, 9 deletions

diff --git a/unicode/src/menu/UMenuBackgroundFade.pas b/unicode/src/menu/UMenuBackgroundFade.pas
index dc37da45..b61a4542 100644
--- a/unicode/src/menu/UMenuBackgroundFade.pas
+++ b/unicode/src/menu/UMenuBackgroundFade.pas
@@ -62,15 +62,17 @@ const
   FADEINTIME = 1500; //Time the bg fades in

 

 implementation

-uses sdl,

-     gl,

-     glext,

-     USkins,

-     UCommon,

-     UGraphic;

+uses

+  sdl,

+  gl,

+  glext,

+  USkins,

+  UCommon,

+  UGraphic;

 

 constructor TMenuBackgroundFade.Create(const ThemedSettings: TThemeBackground);

-var texFilename: string;

+var

+  texFilename: string;

 begin

   inherited;

   FadeTime := 0;

@@ -122,7 +124,7 @@ begin
 

   if (UseTexture) then

   begin //Draw Texture to Screen

-    If (ScreenAct = 1) then //Clear just once when in dual screen mode

+    if (ScreenAct = 1) then //Clear just once when in dual screen mode

       glClear(GL_DEPTH_BUFFER_BIT);

 

     glEnable(GL_TEXTURE_2D);

@@ -151,7 +153,7 @@ begin
   end

   else

   begin //Clear Screen w/ progress Alpha + Color

-    If (ScreenAct = 1) then //Clear just once when in dual screen mode

+    if (ScreenAct = 1) then //Clear just once when in dual screen mode

       glClear(GL_DEPTH_BUFFER_BIT);

       

     glDisable(GL_TEXTURE_2D);