Changeset 303 for branches/highdpi/GameServer.pas

Timestamp:

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

Author:

chronos

Message:

• Modified: Synced code with current trunk version.

File:

• branches/highdpi/GameServer.pas (modified) (9 diffs)

branches/highdpi/GameServer.pas

@@ -7 +7 @@
 
 uses
-  UDpiControls, Protocol, Database, dynlibs, Platform, dateutils, fgl, LazFileUtils, Graphics;
+  UDpiControls, Protocol, Database, dynlibs, Platform, dateutils, fgl, LazFileUtils,
+  Graphics;
 
 const
-  Version = $010200;
+  Version = $010300;
   FirstAICompatibleVersion = $000D00;
   FirstBookCompatibleVersion = $010103;
@@ -561 +562 @@
   MapFile := TFileStream.Create(GetMapsDir + DirectorySeparator + FileName,
     fmCreate or fmShareExclusive);
-  MapFile.Position := 0;
-  s := 'cEvoMap'#0;
-  MapFile.write(s[1], 8); { file id }
-  i := 0;
-  MapFile.write(i, 4); { format id }
-  MapFile.write(MaxTurn, 4);
-  MapFile.write(lx, 4);
-  MapFile.write(ly, 4);
-  MapFile.write(RealMap, MapSize * 4);
-  MapFile.Free;
+  try
+    MapFile.Position := 0;
+    s := 'cEvoMap'#0;
+    MapFile.write(s[1], 8); { file id }
+    i := 0;
+    MapFile.write(i, 4); { format id }
+    MapFile.write(MaxTurn, 4);
+    MapFile.write(lx, 4);
+    MapFile.write(ly, 4);
+    MapFile.write(RealMap, MapSize * 4);
+  finally
+    FreeAndNil(MapFile);
+  end;
 end;
 
@@ -613 +617 @@
       result := true;
     end;
-    MapFile.Free;
+    FreeAndNil(MapFile);
   except
     if MapFile <> nil then
-      MapFile.Free;
+      FreeAndNil(MapFile);
   end;
 end;
@@ -694 +698 @@
   else
     CL.SaveToFile(LogFile);
-  LogFile.Free;
+  FreeAndNil(LogFile);
   if auto then
   begin
@@ -721 +725 @@
         Brains.GetByKind(btAI, AIBrains);
         bix[p1] := AIBrains[DelphiRandom(AIBrains.Count)];
-        AIBrains.Free;
+        FreeAndNil(AIBrains);
       end
     else
@@ -863 +867 @@
     Human := 0;
     for p1 := 0 to nPl - 1 do
-      if bix[p1].Kind = btTerm then
+      if Assigned(bix[p1]) and (bix[p1].Kind = btTerm) then
         inc(Human, 1 shl p1);
     InitMapGame(Human);
@@ -992 +996 @@
   CityProcessing.ReleaseGame;
   Database.ReleaseGame;
-  CL.Free;
+  FreeAndNil(CL);
 end;
 
@@ -1190 +1194 @@
     CL.LoadFromFile(LogFile);
   end;
-  LogFile.Free;
+  FreeAndNil(LogFile);
   if not result then
     Exit;
@@ -4604 +4608 @@
 begin
   FreeAndNil(Picture);
-  inherited Destroy;
+  inherited;
 end;