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

Timestamp:

Apr 6, 2021, 8:11:02 PM (3 years ago)

Author:

chronos

Message:

• Modified: Merged trunk branch version r348 into highdpi branch.

File:

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

branches/highdpi/LocalPlayer/CityScreen.pas

@@ -5 +5 @@
 
 uses
-  UDpiControls, {$IFDEF LINUX}
-  LMessages,
-  {$ENDIF}
+  UDpiControls, {$IFDEF LINUX}LMessages,{$ENDIF}
   Protocol, ClientTools, Term, ScreenTools, IsoEngine, BaseWin,
   LCLIntf, LCLType, Messages, SysUtils, Classes, Graphics, Controls, Forms, ExtCtrls,
@@ -53 +51 @@
     procedure PageUpBtnClick(Sender: TObject);
     procedure PageDownBtnClick(Sender: TObject);
-
+  private
+    c: TCity;
+    Report: TCityReportNew;
+    cOwner: Integer;
+    cGov: Integer;
+    emix: Integer; { enemy model index of produced unit }
+    cix: Integer;
+    cLoc: Integer;
+    Mode: Integer;
+    ZoomArea: Integer;
+    Page: Integer;
+    PageCount: Integer;
+    BlinkTime: Integer;
+    OpenSoundEvent: Integer;
+    SizeClass: Integer;
+    AgePrepared: Integer;
+    Optimize_cixTileChange: Integer;
+    Optimize_TilesBeforeChange: Integer;
+    Happened: cardinal;
+    imix: array [0 .. 15] of integer;
+    CityAreaInfo: TCityAreaInfo;
+    AreaMap: TIsoMap;
+    CityMapTemplate: TDpiBitmap;
+    SmallCityMapTemplate: TDpiBitmap;
+    Back: TDpiBitmap;
+    SmallCityMap: TDpiBitmap;
+    ZoomCityMap: TDpiBitmap;
+    Template: TDpiBitmap;
+    IsPort: Boolean;
+    ProdHint: Boolean;
+    AllowChange: Boolean;
+    procedure InitSmallCityMap;
+    procedure InitZoomCityMap;
+    procedure ChooseProject;
+    procedure ChangeCity(d: integer);
+    procedure ChangeResourceWeights(iResourceWeights: integer);
+    procedure OnPlaySound(var Msg: TMessage); message WM_PLAYSOUND;
   public
     RestoreUnFocus: integer;
@@ -61 +95 @@
     procedure Reset;
     procedure CheckAge;
-
-  private
-    c: TCity;
-    Report: TCityReportNew;
-    cOwner, cGov, emix { enemy model index of produced unit } , cix, cLoc, Mode,
-      ZoomArea, Page, PageCount, BlinkTime, OpenSoundEvent, SizeClass,
-      AgePrepared: integer;
-    Optimize_cixTileChange, Optimize_TilesBeforeChange: integer;
-    Happened: cardinal;
-    imix: array [0 .. 15] of integer;
-    CityAreaInfo: TCityAreaInfo;
-    AreaMap: TIsoMap;
-    CityMapTemplate, SmallCityMapTemplate, Back, SmallCityMap, ZoomCityMap,
-      Template: TDpiBitmap;
-    IsPort, ProdHint, AllowChange: boolean;
-    procedure InitSmallCityMap;
-    procedure InitZoomCityMap;
-    procedure ChooseProject;
-    procedure ChangeCity(d: integer);
-    procedure ChangeResourceWeights(iResourceWeights: integer);
-    procedure OnPlaySound(var Msg: TMessage); message WM_PLAYSOUND;
   end;
 
@@ -87 +100 @@
   CityDlg: TCityDlg;
 
+
 implementation
 
 uses
-  Select, Messg, MessgEx, Help, Tribes, Directories, Math, UPixelPointer, Sound;
+  Select, Messg, MessgEx, Help, Tribes, Directories, Math, Sound;
 
 {$R *.lfm}
@@ -259 +273 @@
     AgePrepared := MainTextureAge;
 
-    // TODO: FillRect should not be needed as BitBlt is with SRCCOPY
-    Back.Canvas.FillRect(0, 0, ClientWidth, ClientHeight);
-
+    UnshareBitmap(Back);
     DpiBitCanvas(Back.Canvas, 0, 0, ClientWidth, ClientHeight,
       MainTexture.Image.Canvas, 0, 0);
@@ -280 +292 @@
     c := MyCity[cix];
   case MyMap[cLoc] and fTerrain of
-    fPrairie:
-      cli1 := cliPrairie;
-    fHills:
-      cli1 := cliHills;
-    fTundra:
-      cli1 := cliTundra;
+    fPrairie: cli1 := cliPrairie;
+    fHills: cli1 := cliHills;
+    fTundra: cli1 := cliTundra;
   else
     cli1 := cliPlains;
@@ -316 +325 @@
     for i := 0 to 29 do
     begin
-      for iix := 28 to nImp - 1 do
+      for iix := nWonder to nImp - 1 do
         if (ImpPosition[iix] = i) and (c.Built[iix] > 0) then
         begin
@@ -327 +336 @@
     i := 30;
     for iix := 0 to nImp do
-      if (c.Built[iix] > 0) and ((iix < 28) or (ImpPosition[iix] < 0)) then
+      if (c.Built[iix] > 0) and ((iix < nWonder) or (ImpPosition[iix] < 0)) then
       begin
         FillRect(Rect(5 + 16 * (i mod 3) + 48 * (i div 18),
@@ -341 +350 @@
       if iix <> imTrGoods then
       begin
-        if (iix >= 28) and (ImpPosition[iix] >= 0) then
+        if (iix >= nWonder) and (ImpPosition[iix] >= 0) then
           i := ImpPosition[iix];
         if i < 36 then
@@ -358 +367 @@
 procedure TCityDlg.InitZoomCityMap;
 begin
-  // TODO: FillRect should not be needed as BitBlt is with SRCCOPY
-  ZoomCityMap.Canvas.FillRect(0, 0, ZoomCityMap.Width, ZoomCityMap.Height);
-
+  UnshareBitmap(ZoomCityMap);
   DpiBitCanvas(ZoomCityMap.Canvas, 0, 0, wZoomMap, hZoomMap,
     Back.Canvas, xZoomMap, yZoomMap);
@@ -387 +394 @@
     if Kind = 3 then
     begin
-      Tex.clBevelLight := GrExt[HGrSystem].Data.Canvas.Pixels[104, 36];
+      Tex.clBevelLight := HGrSystem.Data.Canvas.Pixels[104, 36];
       Tex.clBevelShade := Tex.clBevelLight;
     end;
@@ -400 +407 @@
     rare: boolean;
   begin
+    with AreaMap do begin
     if Server(sGetCityTileInfo, me, Loc, TileInfo) <> eOk then
     begin
@@ -435 +443 @@
       Sprite(offscreen, HGrSystem, x + xxt - 5 + d * (2 * i + 1 - Total),
         y + yyt - 5, 10, 10, xGr, yGr);
+    end;
     end;
   end;
@@ -586 +595 @@
   end;
 
+  with AreaMap do begin
   rx := (192 + xxt * 2 - 1) div (xxt * 2);
   ry := (96 + yyt * 2 - 1) div (yyt * 2);
@@ -612 +622 @@
               Loc1, (dx = 0) and (dy = 0));
         end;
+  end;
 
   if Report.Working > 1 then
@@ -624 +635 @@
       xGr := 141;
     DpiBitCanvas(offscreen.Canvas, xmArea - 192 + 5 + i * d, ymArea - 96 - 29,
-      27, 30, GrExt[HGrSystem].Mask.Canvas, xGr, 171, SRCAND); { shadow }
+      27, 30, HGrSystem.Mask.Canvas, xGr, 171, SRCAND); { shadow }
     Sprite(offscreen, HGrSystem, xmArea - 192 + 4 + i * d, ymArea - 96 - 30, 27,
       30, xGr, 171);
@@ -636 +647 @@
     xGr := 1 + 112;
     DpiBitCanvas(offscreen.Canvas, xmArea + 192 - 27 + 1 - i * d, 29 + 1, 27,
-      30, GrExt[HGrSystem].Mask.Canvas, xGr, 171, SRCAND); { shadow }
+      30, HGrSystem.Mask.Canvas, xGr, 171, SRCAND); { shadow }
     Sprite(offscreen, HGrSystem, xmArea + 192 - 27 - i * d, 29, 27, 30,
       xGr, 171);
@@ -820 +831 @@
       Cnt := 0;
       for iix := 0 to nImp - 1 do
-        if ((iix < 28) or (ImpPosition[iix] < 0)) and (c.Built[iix] > 0) then
+        if ((iix < nWonder) or (ImpPosition[iix] < 0)) and (c.Built[iix] > 0) then
         begin
           i := Cnt - Page * 6;
@@ -831 +842 @@
     else
     begin
-      for iix := 28 to nImp - 1 do
+      for iix := nWonder to nImp - 1 do
       begin
         i := ImpPosition[iix] - 6 * ZoomArea;
@@ -923 +934 @@
             y := ((Cnt - 6 * Page) div 3) * 52 + yZoomMap + 20;
             MakeUnitInfo(me, MyUn[i], UnitInfo);
-            NoMap.SetOutput(offscreen);
-            NoMap.PaintUnit(x, y, UnitInfo, MyUn[i].Status);
+            AreaMap.SetOutput(offscreen);
+            AreaMap.PaintUnit(x, y, UnitInfo, MyUn[i].Status);
 
             for j := 0 to UnitReport.FoodSupport - 1 do
@@ -1052 +1063 @@
         (integer(MyRO.EnemyModel[emix].mix) <> c.Project and cpIndex)) do
         dec(emix);
-      if Tribe[cOwner].ModelPicture[c.Project and cpIndex].HGr = 0 then
+      if not Assigned(Tribe[cOwner].ModelPicture[c.Project and cpIndex].HGr) then
         InitEnemyModel(emix);
     end;
@@ -1310 +1321 @@
     else if (x >= xmArea - 192) and (x < xmArea + 192) and (y >= ymArea - 96)
       and (y < ymArea + 96) then
+    with AreaMap do
     begin
       qx := ((4000 * xxt * yyt) + (x - xmArea) * (yyt * 2) + (y - ymArea + yyt)
@@ -1344 +1356 @@
                 not csResourceWeightsMask; // off
               c.Status := MyCity[cix].Status;
-              SmartUpdateContent
+              SmartUpdateContent;
             end;
             exit;
@@ -1736 +1748 @@
   end; }
 
-var
-  i, j, k: integer;
-
 procedure TCityDlg.PageUpBtnClick(Sender: TObject);
 begin
@@ -1744 +1753 @@
   begin
     dec(Page);
-    SmartUpdateContent
+    SmartUpdateContent;
   end;
 end;
@@ -1753 +1762 @@
   begin
     inc(Page);
-    SmartUpdateContent
+    SmartUpdateContent;
   end;
 end;
@@ -1775 +1784 @@
 end;
 
+procedure SortImprovements;
+var
+  i, j, k: integer;
+begin
+  for i := 0 to nImp - 1 do
+    ImpSorted[i] := i;
+  for i := 0 to nImp - 2 do
+    for j := i + 1 to nImp - 1 do
+      if Prio(ImpSorted[i]) > Prio(ImpSorted[j]) then begin
+        k := ImpSorted[i];
+        ImpSorted[i] := ImpSorted[j];
+        ImpSorted[j] := k;
+      end;
+end;
+
 initialization
 
-for i := 0 to nImp - 1 do
-  ImpSorted[i] := i;
-for i := 0 to nImp - 2 do
-  for j := i + 1 to nImp - 1 do
-    if Prio(ImpSorted[i]) > Prio(ImpSorted[j]) then
-    begin
-      k := ImpSorted[i];
-      ImpSorted[i] := ImpSorted[j];
-      ImpSorted[j] := k;
-    end;
+SortImprovements;
 
 end.