Changeset 352 for trunk/LocalPlayer/CityScreen.pas

Timestamp:

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

Author:

chronos

Message:

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

File:

• trunk/LocalPlayer/CityScreen.pas (modified) (9 diffs)

trunk/LocalPlayer/CityScreen.pas

@@ -82 +82 @@
     ProdHint: Boolean;
     AllowChange: Boolean;
+    RedTex: TTexture;
+    BarTex: TTexture;
     procedure InitSmallCityMap;
     procedure InitZoomCityMap;
@@ -197 +199 @@
 begin
   inherited;
+  RedTex := TTexture.Create;
+  BarTex := TTexture.Create;
   AreaMap := TIsoMap.Create;
   AreaMap.SetOutput(offscreen);
@@ -259 +263 @@
   FreeAndNil(Template);
   FreeAndNil(Back);
+  FreeAndNil(RedTex);
+  FreeAndNil(BarTex);
 end;
 
@@ -269 +275 @@
 procedure TCityDlg.CheckAge;
 begin
-  if MainTextureAge <> AgePrepared then
-  begin
-    AgePrepared := MainTextureAge;
+  if MainTexture.Age <> AgePrepared then begin
+    AgePrepared := MainTexture.Age;
 
     UnshareBitmap(Back);
@@ -388 +393 @@
   procedure FillBar(x, y, pos, Growth, max, Kind: integer;
     IndicateComplete: boolean);
-  var
-    Tex: TTexture;
-  begin
-    Tex := MainTexture;
-    if Kind = 3 then
-    begin
-      Tex.clBevelLight := HGrSystem.Data.Canvas.Pixels[104, 36];
-      Tex.clBevelShade := Tex.clBevelLight;
+  begin
+    BarTex.Assign(MainTexture);
+    if Kind = 3 then begin
+      BarTex.ColorBevelLight := HGrSystem.Data.Canvas.Pixels[104, 36];
+      BarTex.ColorBevelShade := BarTex.ColorBevelLight;
     end;
     PaintRelativeProgressBar(offscreen.Canvas, Kind, x - 3, y, wBar - 4, pos,
-      Growth, max, IndicateComplete, Tex);
+      Growth, max, IndicateComplete, BarTex);
   end;
 
@@ -492 +494 @@
   UnitInfo: TUnitInfo;
   UnitReport: TUnitReport;
-  RedTex: TTexture;
   IsCityAlive, CanGrow: boolean;
 begin
@@ -524 +525 @@
     Report.Working := c.Size;
 
-  RedTex := MainTexture;
-  RedTex.clBevelLight := $0000FF;
-  RedTex.clBevelShade := $000000;
-  RedTex.clTextLight := $000000;
-  RedTex.clTextShade := $0000FF;
+  RedTex.Assign(MainTexture);
+  RedTex.ColorBevelLight := $0000FF;
+  RedTex.ColorBevelShade := $000000;
+  RedTex.ColorTextLight := $000000;
+  RedTex.ColorTextShade := $0000FF;
 
   BitBltCanvas(offscreen.Canvas, 0, 0, 640, 480, Back.Canvas, 0, 0);
@@ -797 +798 @@
     Frame(offscreen.Canvas, xSmallMap + 48 * (ZoomArea div 3),
       ySmallMap + 24 * (ZoomArea mod 3), xSmallMap + 48 * (ZoomArea div 3) + 49,
-      ySmallMap + 24 * (ZoomArea mod 3) + 25, MainTexture.clMark,
-      MainTexture.clMark);
+      ySmallMap + 24 * (ZoomArea mod 3) + 25, MainTexture.ColorMark,
+      MainTexture.ColorMark);
   Frame(offscreen.Canvas, xSmallMap - 1, ySmallMap - 1, xSmallMap + wSmallMap,
     ySmallMap + hSmallMap, $B0B0B0, $FFFFFF);
@@ -812 +813 @@
   if Mode = mSupp then
   begin
-    offscreen.Canvas.brush.Color := MainTexture.clMark;
+    offscreen.Canvas.brush.Color := MainTexture.ColorMark;
     offscreen.Canvas.FillRect(Rect(x - 27, y - 6, x + 27, y + 6));
     offscreen.Canvas.brush.style := bsClear;