- Realigned TfrmLargeScaleCommand

- Fixed overlay being drawn with correct color and alpha

Client/CentrED.lpi

@@ -338,8 +338,8 @@
     </CodeGeneration>
     <Linking>
       <Debugging>
-        <UseLineInfoUnit Value="False"/>
-        <StripSymbols Value="True"/>
+        <GenerateDebugInfo Value="True"/>
+        <UseExternalDbgSyms Value="True"/>
       </Debugging>
       <LinkSmart Value="True"/>
       <Options>

Client/UfrmLargeScaleCommand.pas

@@ -42,14 +42,17 @@ type
   { TfrmLargeScaleCommand }
 
   TfrmLargeScaleCommand = class(TForm)
-    btnClearTerrain: TSpeedButton;
-    btnClearIStaticsTiles: TSpeedButton;
+    btnAddArea: TSpeedButton;
+    btnClearArea: TSpeedButton;
     btnClearDStaticsTiles: TSpeedButton;
-    btnDeleteTerrain: TSpeedButton;
-    btnDeleteIStaticsTiles: TSpeedButton;
-    btnDeleteDStaticsTiles: TSpeedButton;
-    btnExecute: TButton;
+    btnClearIStaticsTiles: TSpeedButton;
+    btnClearTerrain: TSpeedButton;
     btnClose: TButton;
+    btnDeleteArea: TSpeedButton;
+    btnDeleteDStaticsTiles: TSpeedButton;
+    btnDeleteIStaticsTiles: TSpeedButton;
+    btnDeleteTerrain: TSpeedButton;
+    btnExecute: TButton;
     cbCMEraseTarget: TCheckBox;
     gbDrawTerrainTiles: TGroupBox;
     gbDeleteStaticsTiles: TGroupBox;
@@ -78,12 +81,6 @@ type
     pgDeleteStatics: TPage;
     pgInsertStatics: TPage;
     pgModifyAltitude: TPage;
-    pnlControls: TPanel;
-    pnlDrawTerrainTilesControls: TPanel;
-    pnlAreaControls: TPanel;
-    pnlDrawTerrainTilesControls1: TPanel;
-    pnlDrawTerrainTilesControls2: TPanel;
-    pnlLeft: TPanel;
     pbArea: TPaintBox;
     pgArea: TPage;
     pgDrawTerrain: TPage;
@@ -94,15 +91,8 @@ type
     rbSetTerrainAltitude: TRadioButton;
     rbRelativeAltitudeChange: TRadioButton;
     sbArea: TScrollBox;
-    btnAddArea: TSpeedButton;
-    btnDeleteArea: TSpeedButton;
     seDeleteStaticsZ1: TSpinEdit;
     seDeleteStaticsZ2: TSpinEdit;
-    seX1: TSpinEdit;
-    seX2: TSpinEdit;
-    seY1: TSpinEdit;
-    seY2: TSpinEdit;
-    btnClearArea: TSpeedButton;
     seTerrainAltitude1: TSpinEdit;
     seTerrainAltitude2: TSpinEdit;
     seRelativeAltitude: TSpinEdit;
@@ -110,11 +100,15 @@ type
     seInsertStaticsZ: TSpinEdit;
     seCMOffsetX: TSpinEdit;
     seCMOffsetY: TSpinEdit;
+    seX1: TSpinEdit;
+    seX2: TSpinEdit;
+    seY1: TSpinEdit;
+    seY2: TSpinEdit;
     vdtTerrainTiles: TVirtualDrawTree;
     vdtInsertStaticsTiles: TVirtualDrawTree;
     vdtDeleteStaticsTiles: TVirtualDrawTree;
-    vstArea: TVirtualStringTree;
     vstActions: TVirtualStringTree;
+    vstArea: TVirtualStringTree;
     procedure FormShow(Sender: TObject);
     procedure btnAddAreaClick(Sender: TObject);
     procedure btnClearDStaticsTilesClick(Sender: TObject);

Client/UfrmMain.lfm

@@ -1,14 +1,14 @@
 object frmMain: TfrmMain
   Left = 257
-  Height = 603
+  Height = 579
   Top = 135
-  Width = 766
+  Width = 755
   ActiveControl = oglGameWindow
   Caption = 'UO CentrED'
-  ClientHeight = 580
-  ClientWidth = 766
-  Constraints.MinHeight = 603
-  Constraints.MinWidth = 766
+  ClientHeight = 556
+  ClientWidth = 755
+  Constraints.MinHeight = 500
+  Constraints.MinWidth = 750
   Font.Height = -11
   Menu = MainMenu1
   OnActivate = FormActivate
@@ -23,12 +23,12 @@ object frmMain: TfrmMain
   object pnlBottom: TPanel
     Left = 0
     Height = 31
-    Top = 549
-    Width = 766
+    Top = 525
+    Width = 755
     Align = alBottom
     BevelOuter = bvNone
     ClientHeight = 31
-    ClientWidth = 766
+    ClientWidth = 755
     TabOrder = 0
     object lblX: TLabel
       Left = 11
@@ -55,7 +55,7 @@ object frmMain: TfrmMain
       ParentColor = False
     end
     object lblTip: TLabel
-      Left = 528
+      Left = 517
       Height = 31
       Top = 0
       Width = 230
@@ -67,7 +67,7 @@ object frmMain: TfrmMain
       ParentColor = False
     end
     object lblTipC: TLabel
-      Left = 498
+      Left = 487
       Height = 31
       Top = 0
       Width = 30
@@ -108,7 +108,7 @@ object frmMain: TfrmMain
   end
   object pcLeft: TPageControl
     Left = 0
-    Height = 525
+    Height = 501
     Top = 24
     Width = 224
     ActivePage = tsTiles
@@ -117,7 +117,7 @@ object frmMain: TfrmMain
     TabOrder = 1
     object tsTiles: TTabSheet
       Caption = 'Tiles'
-      ClientHeight = 492
+      ClientHeight = 468
       ClientWidth = 218
       object lblFilter: TLabel
         AnchorSideLeft.Control = cbTerrain
@@ -140,7 +140,7 @@ object frmMain: TfrmMain
         AnchorSideRight.Side = asrBottom
         AnchorSideBottom.Control = spTileList
         Left = 4
-        Height = 242
+        Height = 218
         Top = 56
         Width = 210
         Anchors = [akTop, akLeft, akRight, akBottom]
@@ -194,7 +194,7 @@ object frmMain: TfrmMain
         AnchorSideBottom.Side = asrBottom
         Left = 0
         Height = 189
-        Top = 303
+        Top = 279
         Width = 218
         Align = alBottom
         Anchors = [akTop, akLeft, akRight, akBottom]
@@ -543,7 +543,7 @@ object frmMain: TfrmMain
         Cursor = crVSplit
         Left = 0
         Height = 5
-        Top = 298
+        Top = 274
         Width = 218
         Align = alNone
         Anchors = [akLeft, akRight, akBottom]
@@ -557,7 +557,7 @@ object frmMain: TfrmMain
         Left = 110
         Height = 19
         Hint = 'Append S or T to restrict the search to Statics or Terrain.'
-        Top = 271
+        Top = 247
         Width = 96
         Anchors = [akRight, akBottom]
         BorderSpacing.Right = 8
@@ -844,7 +844,7 @@ object frmMain: TfrmMain
     Left = 0
     Height = 24
     Top = 0
-    Width = 766
+    Width = 755
     Caption = 'tbMain'
     Images = ImageList1
     ParentShowHint = False
@@ -1029,13 +1029,13 @@ object frmMain: TfrmMain
     AnchorSideBottom.Control = spChat
     Left = 224
     Height = 22
-    Top = 413
-    Width = 542
+    Top = 389
+    Width = 531
     Anchors = [akLeft, akRight, akBottom]
     BevelInner = bvRaised
     BevelOuter = bvLowered
     ClientHeight = 22
-    ClientWidth = 542
+    ClientWidth = 531
     TabOrder = 3
     object lblChatHeaderCaption: TLabel
       Cursor = crHandPoint
@@ -1063,12 +1063,12 @@ object frmMain: TfrmMain
     AnchorSideBottom.Control = pnlBottom
     Left = 224
     Height = 109
-    Top = 440
-    Width = 542
+    Top = 416
+    Width = 531
     Anchors = [akTop, akLeft, akRight, akBottom]
     BevelOuter = bvNone
     ClientHeight = 109
-    ClientWidth = 542
+    ClientWidth = 531
     TabOrder = 4
     Visible = False
     object vstChat: TVirtualStringTree
@@ -1076,7 +1076,7 @@ object frmMain: TfrmMain
       Left = 0
       Height = 90
       Top = 0
-      Width = 542
+      Width = 531
       Align = alClient
       DefaultText = 'Node'
       Header.AutoSizeIndex = 2
@@ -1094,7 +1094,7 @@ object frmMain: TfrmMain
         item
           Position = 2
           Text = 'Message'
-          Width = 392
+          Width = 381
         end>
       Header.DefaultHeight = 17
       Header.MainColumn = 2
@@ -1114,7 +1114,7 @@ object frmMain: TfrmMain
       Left = 0
       Height = 19
       Top = 90
-      Width = 542
+      Width = 531
       Align = alBottom
       OnKeyPress = edChatKeyPress
       TabOrder = 1
@@ -1128,8 +1128,8 @@ object frmMain: TfrmMain
     Cursor = crVSplit
     Left = 224
     Height = 5
-    Top = 435
-    Width = 542
+    Top = 411
+    Width = 531
     Align = alNone
     Anchors = [akLeft, akRight, akBottom]
     AutoSnap = False
@@ -1145,9 +1145,9 @@ object frmMain: TfrmMain
     AnchorSideRight.Side = asrBottom
     AnchorSideBottom.Control = pnlChatHeader
     Left = 224
-    Height = 389
+    Height = 365
     Top = 24
-    Width = 542
+    Width = 531
     Anchors = [akTop, akLeft, akRight, akBottom]
     OnDblClick = oglGameWindowDblClick
     OnKeyDown = oglGameWindowKeyDown

Client/UfrmMain.pas

@@ -2312,6 +2312,7 @@ begin
       blockInfo^.Text.Render(blockInfo^.ScreenRect);
   end;
 
+  glColor4f(1.0, 1.0, 1.0, 1.0);
   FOverlayUI.Draw(oglGameWindow);
 end;