Changeset 290 for trunk/LocalPlayer/IsoEngine.pas

Timestamp:

Feb 26, 2021, 11:56:48 PM (3 years ago)

Author:

chronos

Message:

• Modified: Use FreeAndNil instead of Free as defensive measure.
• Modified: Use ihnerited without same method name specification.

File:

• trunk/LocalPlayer/IsoEngine.pas (modified) (5 diffs)

trunk/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 := TBitmap.Create;
   LandPatch.PixelFormat := pf24bit;
@@ -175 +175 @@
   LandPatch.Canvas.FillRect(0, 0, LandPatch.Width, LandPatch.Height);
   if OceanPatch <> nil then
-    OceanPatch.Free;
+    FreeAndNil(OceanPatch);
   OceanPatch := TBitmap.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
@@ -418 +418 @@
   end;
   Mask24.EndUpdate;
-  Mask24.Free;
+  FreeAndNil(Mask24);
 
   if Borders <> nil then
-    Borders.Free;
+    FreeAndNil(Borders);
   Borders := TBitmap.Create;
   Borders.PixelFormat := pf24bit;