Changeset 324 for trunk

Timestamp:

Mar 23, 2021, 3:09:11 PM (3 years ago)

Author:

chronos

Message:

• Modified: Code cleanup.

Location:

trunk/LocalPlayer

Files:

• CityScreen.pas (modified) (2 diffs)
• IsoEngine.pas (modified) (4 diffs)

trunk/LocalPlayer/CityScreen.pas

@@ -1732 +1732 @@
   end; }
 
-var
-  i, j, k: integer;
-
 procedure TCityDlg.PageUpBtnClick(Sender: TObject);
 begin
@@ -1771 +1768 @@
 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.

trunk/LocalPlayer/IsoEngine.pas

@@ -14 +14 @@
 
   TIsoMap = class
-    constructor Create;
-    procedure SetOutput(Output: TBitmap);
-    procedure SetPaintBounds(Left, Top, Right, Bottom: integer);
-    procedure Paint(x, y, Loc, nx, ny, CityLoc, CityOwner: integer;
-      UseBlink: boolean = false; CityAllowClick: boolean = false);
-    procedure PaintUnit(x, y: integer; const UnitInfo: TUnitInfo;
-      Status: integer);
-    procedure PaintCity(x, y: integer; const CityInfo: TCityInfo;
-      accessory: boolean = true);
-    procedure BitBltBitmap(Src: TBitmap; x, y, Width, Height, xSrc, ySrc,
-      Rop: integer);
-
-    procedure AttackBegin(const ShowMove: TShowMove);
-    procedure AttackEffect(const ShowMove: TShowMove);
-    procedure AttackEnd;
-
   private
     procedure CityGrid(xm, ym: integer; CityAllowClick: Boolean);
@@ -37 +21 @@
   protected
     FOutput: TBitmap;
-    FLeft, FTop, FRight, FBottom, RealTop, RealBottom, AttLoc, DefLoc,
-      DefHealth, FAdviceLoc: integer;
+    FLeft: Integer;
+    FTop: Integer;
+    FRight: Integer;
+    FBottom: Integer;
+    RealTop: Integer;
+    RealBottom: Integer;
+    AttLoc: Integer;
+    DefLoc: Integer;
+    DefHealth: Integer;
+    FAdviceLoc: Integer;
     DataCanvas: TCanvas;
     MaskCanvas: TCanvas;
@@ -53 +45 @@
     procedure Sprite(HGr: TGraphicSet; xDst, yDst, Width, Height, xGr, yGr: integer);
     procedure TSprite(xDst, yDst, grix: integer; PureBlack: boolean = false);
-
   public
+    constructor Create;
+    procedure SetOutput(Output: TBitmap);
+    procedure SetPaintBounds(Left, Top, Right, Bottom: integer);
+    procedure Paint(x, y, Loc, nx, ny, CityLoc, CityOwner: integer;
+      UseBlink: boolean = false; CityAllowClick: boolean = false);
+    procedure PaintUnit(x, y: integer; const UnitInfo: TUnitInfo;
+      Status: integer);
+    procedure PaintCity(x, y: integer; const CityInfo: TCityInfo;
+      accessory: boolean = true);
+    procedure BitBltBitmap(Src: TBitmap; x, y, Width, Height, xSrc, ySrc,
+      Rop: integer);
+    procedure AttackBegin(const ShowMove: TShowMove);
+    procedure AttackEffect(const ShowMove: TShowMove);
+    procedure AttackEnd;
     property AdviceLoc: integer read FAdviceLoc write FAdviceLoc;
   end;
@@ -1036 +1041 @@
         if BordersOK and (1 shl p1) = 0 then
         begin
-          // Clearing before BitBltBitmap SRCCOPY shouldn't be neccesary but for some
-          // reason without it code works different then under Delphi
-          Borders.Canvas.FillRect(Bounds(0, p1 * (yyt * 2), xxt * 2, yyt * 2));
-
+          UnshareBitmap(Borders);
           BitBltCanvas(Borders.Canvas, 0, p1 * (yyt * 2), xxt * 2,
             yyt * 2, HGrTerrain.Data.Canvas,