Changeset 303 for branches/highdpi/LocalPlayer/IsoEngine.pas

Timestamp:

Mar 9, 2021, 9:19:49 AM (3 years ago)

Author:

chronos

Message:

• Modified: Synced code with current trunk version.

File:

• branches/highdpi/LocalPlayer/IsoEngine.pas (modified) (8 diffs)

branches/highdpi/LocalPlayer/IsoEngine.pas

@@ -133 +133 @@
   OnInitEnemyModel := InitEnemyModelHandler;
   if NoMap <> nil then
-    NoMap.Free;
+    FreeAndNil(NoMap);
   NoMap := TIsoMap.Create;
 end;
@@ -168 +168 @@
   { prepare dithered ground tiles }
   if LandPatch <> nil then
-    LandPatch.Free;
+    FreeAndNil(LandPatch);
   LandPatch := TDpiBitmap.Create;
   LandPatch.PixelFormat := pf24bit;
@@ -175 +175 @@
   LandPatch.Canvas.FillRect(0, 0, LandPatch.Width, LandPatch.Height);
   if OceanPatch <> nil then
-    OceanPatch.Free;
+    FreeAndNil(OceanPatch);
   OceanPatch := TDpiBitmap.Create;
   OceanPatch.PixelFormat := pf24bit;
@@ -363 +363 @@
       DitherMask.Canvas, 0, 0, SRCAND);
 
-  LandMore.Free;
-  OceanMore.Free;
-  DitherMask.Free;
+  FreeAndNil(LandMore);
+  FreeAndNil(OceanMore);
+  FreeAndNil(DitherMask);
 
   // reduce size of terrain icons
@@ -417 +417 @@
   end;
   Mask24.EndUpdate;
-  Mask24.Free;
+  FreeAndNil(Mask24);
 
   if Borders <> nil then
-    Borders.Free;
+    FreeAndNil(Borders);
   Borders := TDpiBitmap.Create;
   Borders.PixelFormat := pf24bit;
@@ -702 +702 @@
     end;
     Textout(xShield + 2, yShield - 1, LabelTextColor, s);
-  end
+  end;
 end; { PaintCity }
 
@@ -1078 +1078 @@
   if not(FoW and (Tile and fObserved = 0)) then
     PaintBorder;
+
   if (Loc >= 0) and (Loc < G.lx * G.ly) and (Loc = FAdviceLoc) then
     TSprite(x, y, spPlain);
@@ -1287 +1288 @@
   i: integer;
 begin
-  FOutput.Canvas.pen.Color := $000000; // $FF shl (8*random(3));
   FOutput.Canvas.pen.Color := $000000; // $FF shl (8*random(3));
   for i := 0 to nx div 2 do