merged trunk into lua branch

plugin loading is disabled atm because of a bug reading the files (lua may be the reason). 
Reading the files in usdx and passing the contents to lua may solve this

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

1 files changed, 6 insertions, 5 deletions

diff --git a/Lua/src/menu/UMenuStatic.pas b/Lua/src/menu/UMenuStatic.pas
index 9a10fade..72f4eb36 100644
--- a/Lua/src/menu/UMenuStatic.pas
+++ b/Lua/src/menu/UMenuStatic.pas
@@ -40,19 +40,20 @@ uses
 type
   TStatic = class
     public
-      Texture:    TTexture; // Button Screen position and size
-      Visible:    boolean;
+      Texture:           TTexture; // Button Screen position and size
+      Visible:           boolean;
 
       //Reflection Mod
-      Reflection:           boolean;
-      Reflectionspacing:    Real;
+      Reflection:        boolean;
+      Reflectionspacing: real;
 
       procedure Draw;
       constructor Create(Textura: TTexture); overload;
   end;
 
 implementation
-uses UDrawTexture;
+uses
+  UDrawTexture;
 
 procedure TStatic.Draw;
 begin