Changeset 290 for trunk/LocalPlayer/Term.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/Term.pas (modified) (4 diffs)

trunk/LocalPlayer/Term.pas

@@ -1243 +1243 @@
     if AILogo[p] <> nil then
     begin
-      AILogo[p].free;
-      AILogo[p] := nil
+      FreeAndNil(AILogo[p]);
     end
   end
@@ -1253 +1252 @@
     if not LoadGraphicFile(AILogo[p], HomeDir + Name + '.png', gfNoError) then
     begin
-      AILogo[p].free;
-      AILogo[p] := nil
+      FreeAndNil(AILogo[p]);
     end
   end
@@ -2497 +2495 @@
     cReleaseModule:
       begin
-        SmallImp.free;
-        UnusedTribeFiles.free;
-        TribeNames.free;
-        MainMap.free;
+        FreeAndNil(SmallImp);
+        FreeAndNil(UnusedTribeFiles);
+        FreeAndNil(TribeNames);
+        FreeAndNil(MainMap);
         IsoEngine.Done;
         // AdvisorDlg.DeInit;
@@ -2698 +2696 @@
         for p1 := 0 to nPl - 1 do
           if Tribe[p1] <> nil then
-            Tribe[p1].free;
+            FreeAndNil(Tribe[p1]);
         Tribes.Done;
         RepaintOnResize := false;