Changeset 352 for trunk/LocalPlayer/Select.pas

Timestamp:

Apr 6, 2021, 10:16:55 PM (3 years ago)

Author:

chronos

Message:

• Modified: TTexture changed from record to class.
• Modified: Code cleanup.

File:

• trunk/LocalPlayer/Select.pas (modified) (15 diffs)

trunk/LocalPlayer/Select.pas

@@ -202 +202 @@
     begin
       Frame(offscreen.Canvas, x + (16 - 1), y + (16 - 2), x + (16 + xSizeSmall),
-        y + (16 - 1 + ySizeSmall), MainTexture.clBevelLight,
-        MainTexture.clBevelShade);
+        y + (16 - 1 + ySizeSmall), MainTexture.ColorBevelLight,
+        MainTexture.ColorBevelShade);
       if pix and cpType = 0 then
         if (pix and cpIndex = imPalace) and (MyRO.Government <> gAnarchy) then
@@ -231 +231 @@
       if y + TextSize.cy >= TitleHeight + InnerHeight then
         TextSize.cy := TitleHeight + InnerHeight - y;
-      Fill(ca, x, y, TextSize.cx, TextSize.cy, (wMaintexture - ClientWidth)
-        div 2, (hMaintexture - ClientHeight) div 2);
+      Fill(ca, x, y, TextSize.cx, TextSize.cy, (Maintexture.Width - ClientWidth)
+        div 2, (Maintexture.Height - ClientHeight) div 2);
     end;
     LoweredTextOut(ca, Color, MainTexture, x, y, s);
@@ -260 +260 @@
       begin
         x := x + SideFrame;
-        y := y + TitleHeight
+        y := y + TitleHeight;
       end;
       if lit then
-        TextColor := MainTexture.clLitText
+        TextColor := MainTexture.ColorLitText
       else
         TextColor := -1;
@@ -434 +434 @@
     end;
     if lit then
-      TextColor := MainTexture.clLitText
+      TextColor := MainTexture.ColorLitText
     else
       TextColor := -1;
@@ -556 +556 @@
               begin
                 Frame(offscreen.Canvas, (8 + 16 - 1), y0 - 1, (8 + 16 + 36),
-                  y0 + 20, MainTexture.clBevelLight, MainTexture.clBevelShade);
+                  y0 + 20, MainTexture.ColorBevelLight, MainTexture.ColorBevelShade);
                 Dump(offscreen, HGrSystem, (8 + 16), y0, 36, 20, 223, 295)
               end
@@ -562 +562 @@
               begin
                 Frame(offscreen.Canvas, (8 + 16 - 1), y0 - 1, (8 + 16 + 36),
-                  y0 + 20, MainTexture.clBevelLight, MainTexture.clBevelShade);
+                  y0 + 20, MainTexture.ColorBevelLight, MainTexture.ColorBevelShade);
                 Dump(offscreen, HGrSystem, (8 + 16), y0, 36, 20, 260, 295)
               end
@@ -568 +568 @@
               begin
                 Frame(offscreen.Canvas, (8 + 16 - 1), y0 - 1, (8 + 16 + 36),
-                  y0 + 20, MainTexture.clBevelLight, MainTexture.clBevelShade);
+                  y0 + 20, MainTexture.ColorBevelLight, MainTexture.ColorBevelShade);
                 Dump(offscreen, HGrSystem, (8 + 16), y0, 36, 20, 38, 295)
               end
@@ -575 +575 @@
                 Frame(offscreen.Canvas, (8 + 16 - 1), y0 - 1,
                   (8 + 16 + xSizeSmall), y0 + ySizeSmall,
-                  MainTexture.clBevelLight, MainTexture.clBevelShade);
+                  MainTexture.ColorBevelLight, MainTexture.ColorBevelShade);
                 if AdvIcon[lix] < 84 then
                   BitBltCanvas(offscreen.Canvas, (8 + 16), y0, xSizeSmall,
@@ -681 +681 @@
             Frame(offscreen.Canvas, 8 + 16 - 1, y0 - 15 + (16 - 2),
               8 + 16 + xSizeSmall, y0 - 15 + (16 - 1 + ySizeSmall),
-              MainTexture.clBevelLight, MainTexture.clBevelShade);
+              MainTexture.ColorBevelLight, MainTexture.ColorBevelShade);
             BitBltCanvas(offscreen.Canvas, 8 + 16, y0 - 15 + (16 - 1),
               xSizeSmall, ySizeSmall, SmallImp.Canvas,
@@ -712 +712 @@
     end;
     if lit then
-      TextColor := MainTexture.clLitText
+      TextColor := MainTexture.ColorLitText
     else
       TextColor := -1;
@@ -812 +812 @@
     begin
       Fill(Canvas, 9, ClientHeight - 29, ClientWidth - 18, 24,
-        (wMaintexture - ClientWidth) div 2,
-        (hMaintexture - ClientHeight) div 2);
+        (Maintexture.Width - ClientWidth) div 2,
+        (Maintexture.Height - ClientHeight) div 2);
       if ScienceNation >= 0 then
       begin
@@ -829 +829 @@
           ScienceNationDot.Height, Canvas, xScreen - 10, ClientHeight - 27);
         ImageOp_BCC(ScienceNationDotBuffer, Templates.Data, Point(0, 0),
-          ScienceNationDot.BoundsRect, MainTexture.clBevelShade, Tribe[ScienceNation].Color);
+          ScienceNationDot.BoundsRect, MainTexture.ColorBevelShade, Tribe[ScienceNation].Color);
         BitBltCanvas(Canvas, xScreen - 10, ClientHeight - 27, ScienceNationDot.Width,
           ScienceNationDot.Height, ScienceNationDotBuffer.Canvas, 0, 0);
@@ -1532 +1532 @@
   begin
     LineDistance := 21; // looks ugly with scrollbar
-    MaxLines := (hMaintexture - (24 + TitleHeight + NarrowFrame))
+    MaxLines := (Maintexture.Height - (24 + TitleHeight + NarrowFrame))
       div LineDistance - 1;
   end
@@ -1538 +1538 @@
   begin
     LineDistance := 24;
-    MaxLines := (hMaintexture - (24 + TitleHeight + WideFrame))
+    MaxLines := (Maintexture.Height - (24 + TitleHeight + WideFrame))
       div LineDistance - 1;
   end;
@@ -1574 +1574 @@
     ClientHeight := InnerHeight + TitleHeight + NarrowFrame;
   end;
-  assert(ClientHeight <= hMaintexture);
+  assert(ClientHeight <= Maintexture.Height);
 
   TechNameSpace := 224;