Changeset 361 for branches/highdpi/LocalPlayer/CityScreen.pas

Timestamp:

Apr 9, 2021, 5:56:50 PM (3 years ago)

Author:

chronos

Message:

• Modified: Merged changes from trunk r360 into highdpi branch.

File:

• branches/highdpi/LocalPlayer/CityScreen.pas (modified) (28 diffs)

branches/highdpi/LocalPlayer/CityScreen.pas

@@ -15 +15 @@
 type
   TCityCloseAction = (None, RestoreFocus, StepFocus);
+  TSmallMapMode = (smSupportedUnits, smImprovements);
 
   TCityDlg = class(TBufferedDrawDlg)
@@ -59 +60 @@
     cix: Integer;
     cLoc: Integer;
-    Mode: Integer;
+    SmallMapMode: TSmallMapMode;
     ZoomArea: Integer;
     Page: Integer;
@@ -73 +74 @@
     CityAreaInfo: TCityAreaInfo;
     AreaMap: TIsoMap;
+    NoMap: TIsoMap;
     CityMapTemplate: TDpiBitmap;
     SmallCityMapTemplate: TDpiBitmap;
@@ -82 +84 @@
     ProdHint: Boolean;
     AllowChange: Boolean;
+    RedTex: TTexture;
+    BarTex: TTexture;
     procedure InitSmallCityMap;
     procedure InitZoomCityMap;
@@ -109 +113 @@
 
 const
-  { modes }
-  mSupp = 1;
-  mImp = 2;
-
   wBar = 106;
   xDiv = 400;
@@ -197 +197 @@
 begin
   inherited;
+  RedTex := TTexture.Create;
+  BarTex := TTexture.Create;
+  NoMap := TIsoMap.Create;
   AreaMap := TIsoMap.Create;
   AreaMap.SetOutput(offscreen);
   AreaMap.SetPaintBounds(xmArea - 192, ymArea - 96 - 32, xmArea + 192,
     ymArea + 96);
-  Mode := mImp;
+  SmallMapMode := smImprovements;
   ZoomArea := 1;
   ProdHint := false;
@@ -208 +211 @@
   AgePrepared := -2;
   Optimize_cixTileChange := -1;
-  InitButtons();
+  InitButtons;
   // InitWindowRegion;
   CloseBtn.Caption := Phrases.Lookup('BTN_OK');
@@ -252 +255 @@
 procedure TCityDlg.FormDestroy(Sender: TObject);
 begin
+  FreeAndNil(NoMap);
   FreeAndNil(AreaMap);
   FreeAndNil(SmallCityMap);
@@ -259 +263 @@
   FreeAndNil(Template);
   FreeAndNil(Back);
+  FreeAndNil(RedTex);
+  FreeAndNil(BarTex);
 end;
 
 procedure TCityDlg.Reset;
 begin
-  Mode := mImp;
+  SmallMapMode := smImprovements;
   ZoomArea := 1;
 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);
@@ -370 +375 @@
   DpiBitCanvas(ZoomCityMap.Canvas, 0, 0, wZoomMap, hZoomMap,
     Back.Canvas, xZoomMap, yZoomMap);
-  if Mode = mImp then begin
+  if SmallMapMode = smImprovements then begin
     if ZoomArea < 3 then begin
       ImageOp_B(ZoomCityMap, CityMapTemplate, 0, 0, 376 * SizeClass,
@@ -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;
 
   DpiBitCanvas(offscreen.Canvas, 0, 0, 640, 480, Back.Canvas, 0, 0);
@@ -596 +597 @@
 
   with AreaMap do begin
-  rx := (192 + xxt * 2 - 1) div (xxt * 2);
-  ry := (96 + yyt * 2 - 1) div (yyt * 2);
-  AreaMap.Paint(xmArea - xxt * 2 * rx, ymArea - yyt * 2 * ry - 3 * yyt,
-    dLoc(cLoc, -2 * rx + 1, -2 * ry - 1), 4 * rx - 1, 4 * ry + 1, cLoc, cOwner,
-    false, AllowChange and IsCityAlive and
-    (c.Status and csResourceWeightsMask = 0));
-  DpiBitCanvas(offscreen.Canvas, xmArea + 102, 42, 90, 33, Back.Canvas,
-    xmArea + 102, 42);
-
-  if IsCityAlive then
-    for dy := -3 to 3 do
-      for dx := -3 to 3 do
-        if ((dx + dy) and 1 = 0) and (dx * dx * dy * dy < 81) then
-        begin
-          Loc1 := dLoc(cLoc, dx, dy);
-          av := CityAreaInfo.Available[(dy + 3) shl 2 + (dx + 3) shr 1];
-          if ((av = faNotAvailable) or (av = faTreaty) or (av = faInvalid)) and
-            ((Loc1 < 0) or (Loc1 >= G.lx * G.ly) or (MyMap[Loc1] and fCity = 0))
-          then
-            Sprite(offscreen, HGrTerrain, xmArea - xxt + xxt * dx,
-              ymArea - yyt + yyt * dy, xxt * 2, yyt * 2, 1 + 5 * (xxt * 2 + 1),
-              1 + yyt + 15 * (yyt * 3 + 1));
-          if (1 shl ((dy + 3) shl 2 + (dx + 3) shr 1) and c.Tiles <> 0) then
-            PaintResources(xmArea - xxt + xxt * dx, ymArea - yyt + yyt * dy,
-              Loc1, (dx = 0) and (dy = 0));
-        end;
+    rx := (192 + xxt * 2 - 1) div (xxt * 2);
+    ry := (96 + yyt * 2 - 1) div (yyt * 2);
+    AreaMap.Paint(xmArea - xxt * 2 * rx, ymArea - yyt * 2 * ry - 3 * yyt,
+      dLoc(cLoc, -2 * rx + 1, -2 * ry - 1), 4 * rx - 1, 4 * ry + 1, cLoc, cOwner,
+      false, AllowChange and IsCityAlive and
+      (c.Status and csResourceWeightsMask = 0));
+    DpiBitCanvas(offscreen.Canvas, xmArea + 102, 42, 90, 33, Back.Canvas,
+      xmArea + 102, 42);
+
+    if IsCityAlive then
+      for dy := -3 to 3 do
+        for dx := -3 to 3 do
+          if ((dx + dy) and 1 = 0) and (dx * dx * dy * dy < 81) then begin
+            Loc1 := dLoc(cLoc, dx, dy);
+            av := CityAreaInfo.Available[(dy + 3) shl 2 + (dx + 3) shr 1];
+            if ((av = faNotAvailable) or (av = faTreaty) or (av = faInvalid)) and
+              ((Loc1 < 0) or (Loc1 >= G.lx * G.ly) or (MyMap[Loc1] and fCity = 0))
+            then
+              Sprite(offscreen, HGrTerrain, xmArea - xxt + xxt * dx,
+                ymArea - yyt + yyt * dy, xxt * 2, yyt * 2, 1 + 5 * (xxt * 2 + 1),
+                1 + yyt + 15 * (yyt * 3 + 1));
+            if (1 shl ((dy + 3) shl 2 + (dx + 3) shr 1) and c.Tiles <> 0) then
+              PaintResources(xmArea - xxt + xxt * dx, ymArea - yyt + yyt * dy,
+                Loc1, (dx = 0) and (dy = 0));
+          end;
   end;
 
@@ -794 +794 @@
   DpiBitCanvas(offscreen.Canvas, xSmallMap, ySmallMap, wSmallMap, hSmallMap,
     SmallCityMap.Canvas, 0, 0);
-  if Mode = mImp then
+  if SmallMapMode = smImprovements then
     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);
@@ -810 +810 @@
   x := xSupport + wSupport div 2;
   y := ySupport + hSupport div 2;
-  if Mode = mSupp then
-  begin
-    offscreen.Canvas.brush.Color := MainTexture.clMark;
+  if SmallMapMode = smSupportedUnits then
+  begin
+    offscreen.Canvas.brush.Color := MainTexture.ColorMark;
     offscreen.Canvas.FillRect(Rect(x - 27, y - 6, x + 27, y + 6));
     offscreen.Canvas.brush.style := bsClear;
@@ -825 +825 @@
   for i := 0 to 5 do
     imix[i] := -1;
-  if Mode = mImp then
+  if SmallMapMode = smImprovements then
   begin
     if ZoomArea = 5 then
@@ -917 +917 @@
       Imp5Area.Hint := '';
   end
-  else { if mode=mSupp then }
+  else { if SmallMapMode = smSupportedUnits then }
   begin
     LoweredTextout(offscreen.Canvas, -1, MainTexture, xZoomMap + 6,
@@ -934 +934 @@
             y := ((Cnt - 6 * Page) div 3) * 52 + yZoomMap + 20;
             MakeUnitInfo(me, MyUn[i], UnitInfo);
-            AreaMap.SetOutput(offscreen);
-            AreaMap.PaintUnit(x, y, UnitInfo, MyUn[i].Status);
+            NoMap.SetOutput(offscreen);
+            NoMap.PaintUnit(x, y, UnitInfo, MyUn[i].Status);
 
             for j := 0 to UnitReport.FoodSupport - 1 do
@@ -1048 +1048 @@
   else { enemy city }
   begin
-    Mode := mImp;
+    SmallMapMode := smImprovements;
     Server(sGetCity, me, cLoc, GetCityData);
     c := GetCityData.c;
@@ -1146 +1146 @@
     (y >= ySmallMap) and (y < ySmallMap + hSmallMap) then
   begin
-    Mode := mImp;
+    SmallMapMode := smImprovements;
     ZoomArea := (y - ySmallMap) * 3 div hSmallMap + 3 *
       ((x - xSmallMap) * 2 div wSmallMap);
@@ -1157 +1157 @@
     (y >= ySupport) and (y < ySupport + hSupport) then
   begin
-    Mode := mSupp;
+    SmallMapMode := smSupportedUnits;
     Page := 0;
     InitZoomCityMap;
@@ -1189 +1189 @@
         ChooseProject;
       end
-    else if (Mode = mImp) and (x >= xZoomMap) and (x < xZoomMap + wZoomMap) and
+    else if (SmallMapMode = smImprovements) and (x >= xZoomMap) and (x < xZoomMap + wZoomMap) and
       (y >= yZoomMap) and (y < yZoomMap + hZoomMap) then
     begin
@@ -1203 +1203 @@
         if iix >= 0 then
           if ssShift in Shift then
-            HelpDlg.ShowNewContent(Mode or wmPersistent, hkImp, iix)
+            HelpDlg.ShowNewContent(FWindowMode or wmPersistent, hkImp, iix)
           else if (ClientMode < scContact) then
             with MessgExDlg do
@@ -1300 +1300 @@
       end;
     end
-    else if (Mode = mSupp) and (x >= xZoomMap) and (x < xZoomMap + wZoomMap) and
+    else if (SmallMapMode = smSupportedUnits) and (x >= xZoomMap) and (x < xZoomMap + wZoomMap) and
       (y >= yZoomMap) and (y < yZoomMap + hZoomMap) then
     begin
@@ -1321 +1321 @@
     else if (x >= xmArea - 192) and (x < xmArea + 192) and (y >= ymArea - 96)
       and (y < ymArea + 96) then
-    with AreaMap do
-    begin
+    with AreaMap do begin
       qx := ((4000 * xxt * yyt) + (x - xmArea) * (yyt * 2) + (y - ymArea + yyt)
         * (xxt * 2)) div (xxt * yyt * 4) - 1000;
@@ -1335 +1334 @@
           Loc1 := dLoc(cLoc, dx, dy);
           if (Loc1 >= 0) and (Loc1 < G.lx * G.ly) then
-            HelpOnTerrain(Loc1, Mode or wmPersistent)
+            HelpOnTerrain(Loc1, FWindowMode or wmPersistent)
         end
         else if (ClientMode < scContact) and (cGov <> gAnarchy) and