editing

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

1 files changed, 33 insertions, 30 deletions

diff --git a/src/menu/UMenuButton.pas b/src/menu/UMenuButton.pas
index a0cdaeef..c6ff8ab7 100644
--- a/src/menu/UMenuButton.pas
+++ b/src/menu/UMenuButton.pas
@@ -45,24 +45,24 @@ type
 
   TButton = class
     protected
-      SelectBool:           Boolean;
+      SelectBool:   boolean;
 
-      FadeProgress:         Real;
-      FadeLastTick:         Cardinal;
+      FadeProgress: real;
+      FadeLastTick: cardinal;
 
       DeSelectW,
       DeSelectH,
       PosX,
-      PosY:                 Real;
+      PosY:         real;
 
       constructor Create(); overload;
 
     public
-      Text:                      Array of TText;
+      Text:                      array of TText;
       Texture:                   TTexture; // Button Screen position and size
       Texture2:                  TTexture; // second texture only used for fading full resolution covers
 
-      Colorized: Boolean;
+      Colorized:                 boolean;
       DeSelectTexture:           TTexture; // texture for colorized hack
 
       FadeTex:                   TTexture; //Texture for beautiful fading
@@ -73,15 +73,15 @@ type
 
       Reflection:                boolean;
       Reflectionspacing,
-      DeSelectReflectionspacing: Real;
+      DeSelectReflectionspacing: real;
 
       Fade,
-      FadeText:                  Boolean;
+      FadeText:                  boolean;
 
       Selectable:                boolean;
 
       //Number of the Parent Collection, 0 if in no Collection
-      Parent:  Byte;
+      Parent:  byte;
 
       SelectColR,
       SelectColG,
@@ -103,13 +103,13 @@ type
       procedure SetW(Value: real);
       procedure SetH(Value: real);
 
-      procedure SetSelect(Value: Boolean); virtual;
+      procedure SetSelect(Value: boolean); virtual;
       property X: real read PosX write SetX;
       property Y: real read PosY write SetY;
       property Z: real read Texture.z write Texture.z;
       property W: real read DeSelectW write SetW;
       property H: real read DeSelectH write SetH;
-      property Selected: Boolean read SelectBool write SetSelect;
+      property Selected: boolean read SelectBool write SetSelect;
 
       procedure   Draw; virtual;
 
@@ -120,8 +120,9 @@ type
 
 implementation
 
-uses SysUtils,
-     UDrawTexture;
+uses 
+  SysUtils,
+  UDrawTexture;
 
 procedure TButton.SetX(Value: real);
 {var
@@ -143,8 +144,8 @@ end;
 
 procedure TButton.SetY(Value: real);
 {var
-  dY:   real;
-  T:    integer;    // text}
+  dY: real;
+  T:  integer;    // text}
 begin
   {dY := Value - PosY;
 
@@ -164,7 +165,7 @@ begin
 
   DeSelectW := Value;
 
-  if Not Fade then
+  if not Fade then
   begin
     if SelectBool then
       Texture.W := SelectW
@@ -180,7 +181,7 @@ begin
 
   DeSelectH := Value;
 
-  if Not Fade then
+  if not Fade then
   begin
     if SelectBool then
       Texture.H := SelectH
@@ -189,9 +190,9 @@ begin
   end;
 end;
 
-procedure TButton.SetSelect(Value : Boolean);
+procedure TButton.SetSelect(Value : boolean);
 var
-  T:    integer;
+  T: integer;
 begin
   SelectBool := Value;
 
@@ -291,9 +292,9 @@ end;
 
 procedure TButton.Draw;
 var
-  T:    integer;
-  Tick: Cardinal;
-  Spacing: Real;
+  T:       integer;
+  Tick:    cardinal;
+  Spacing: real;
 begin
   if Visible then
   begin
@@ -315,7 +316,7 @@ begin
 
           if (FadeText) then
           begin
-            For T := 0 to high(Text) do
+            for T := 0 to high(Text) do
             begin
               Text[T].MoveX := (SelectW - DeSelectW) * FadeProgress;
               Text[T].MoveY := (SelectH - DeSelectH) * FadeProgress;
@@ -353,7 +354,7 @@ begin
         FadeTex.TexY1     := 0;
         FadeTex.TexY2     := 1;
 
-        Case FadeTexPos of
+        case FadeTexPos of
           0: //FadeTex on Top
             begin
               //Standard Texture
@@ -465,7 +466,7 @@ begin
     //Reflection Mod
     if (Reflection) then // Draw Reflections
     begin
-      if (FadeProgress <> 0) AND (FadeProgress <> 1) then
+      if (FadeProgress <> 0) and (FadeProgress <> 1) then
       begin
         Spacing := DeSelectReflectionspacing - (DeSelectReflectionspacing - Reflectionspacing) * FadeProgress;
       end
@@ -514,9 +515,10 @@ begin
         glDisable(GL_TEXTURE_2D);
         glDisable(GL_DEPTH_TEST);
         glDisable(GL_BLEND);
-      end else
+      end
+      else
       with DeSelectTexture do
-        begin
+      begin
         //Bind Tex and GL Attributes
         glEnable(GL_TEXTURE_2D);
         glEnable(GL_BLEND);
@@ -556,7 +558,8 @@ begin
       end;
     end;
 
-    for T := 0 to High(Text) do begin
+    for T := 0 to High(Text) do
+    begin
       Text[T].Draw;
     end;
   end;
@@ -577,7 +580,7 @@ begin
   Texture.ColG    := 0.5;
   Texture.ColB    := 0;
   Texture.Int     := 1;
-  Colorized       := False;
+  Colorized       := false;
 end;
 
 // Button has the texture-type "colorized"
@@ -592,7 +595,7 @@ begin
   Texture.ColG    := 1;
   Texture.ColB    := 1;
   Texture.Int     := 1;
-  Colorized       := True;
+  Colorized       := true;
 end;
 
 end.