Changeset 210 for branches/highdpi/GameServer.pas

Timestamp:

May 9, 2020, 4:02:07 PM (5 years ago)

Author:

chronos

Message:

• Modified: Improved HighDPI branch. Imported new changes from trunk branch.

File:

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

branches/highdpi/GameServer.pas

@@ -7 +7 @@
 
 uses
-  Protocol, Database, dynlibs, Platform, dateutils, fgl, FileUtil, Graphics,
-  UDpiControls;
+  UDpiControls, Protocol, Database, dynlibs, Platform, dateutils, fgl, LazFileUtils, Graphics;
 
 const
@@ -117 +116 @@
 function PreviewMap(lm: integer): pointer;
 
+
 implementation
 
 uses
-  Directories, CityProcessing, UnitProcessing, CmdList,
-
-  LCLIntf, LCLType, LMessages, Classes, SysUtils;
+  Directories, CityProcessing, UnitProcessing, CmdList, LCLIntf, LCLType,
+  LMessages, Classes, SysUtils;
+
+resourcestring
+  SNoAiFound = 'No AI libraries found in directory %s';
 
 var
@@ -257 +259 @@
   BrainBeginner := nil;
 
-  if FindFirst(HomeDir + 'AI' + DirectorySeparator + '*', faDirectory or faArchive or faReadOnly, f) = 0 then
+  if FindFirst(GetAiDir + DirectorySeparator + '*', faDirectory or faArchive or faReadOnly, f) = 0 then
   repeat
-    BasePath := HomeDir + 'AI' + DirectorySeparator + f.Name;
+    BasePath := GetAiDir + DirectorySeparator + f.Name;
     if (f.Name <> '.') and (f.Name <> '..') and DirectoryExists(BasePath) then begin
       NewBrain := Brains.AddNew;
@@ -273 +275 @@
 
   if Brains.GetKindCount(btAI) = 0 then
-    raise Exception.Create(Format('No AI libraries found in directory %s', [HomeDir + 'AI']));
+    raise Exception.Create(Format(SNoAiFound, [GetAiDir]));
 end;
 
@@ -305 +307 @@
   end;
   CreateMap(true);
-  result := @RealMap;
+  Result := @RealMap;
 end;
 
@@ -557 +559 @@
   s: string[255];
 begin
-  MapFile := TFileStream.Create(DataDir + 'Maps' + DirectorySeparator + FileName,
+  MapFile := TFileStream.Create(GetMapsDir + DirectorySeparator + FileName,
     fmCreate or fmShareExclusive);
   MapFile.Position := 0;
@@ -580 +582 @@
   MapFile := nil;
   try
-    MapFile := TFileStream.Create(DataDir + 'Maps' + DirectorySeparator + FileName,
+    MapFile := TFileStream.Create(GetMapsDir + DirectorySeparator + FileName,
       fmOpenRead or fmShareExclusive);
     MapFile.Position := 0;
@@ -1367 +1369 @@
   LogFileName := FileName;
   MapFileName := Map;
-  if FastContact then
-  begin
+  {$IFDEF FastContact}
     lx := 24;
     ly := 42;
-  end
-  else
-  begin
+  {$ELSE}
     lx := Newlx;
-    ly := Newly
-  end;
+    ly := Newly;
+  {$ENDIF}
   MapSize := lx * ly;
   if MapFileName <> '' then
@@ -2698 +2697 @@
   end;
 
-const
-  Dirx: array [0 .. 7] of integer = (1, 2, 1, 0, -1, -2, -1, 0);
-  Diry: array [0 .. 7] of integer = (-1, 0, 1, 2, 1, 0, -1, -2);
-
 var
   d, i, j, p1, p2, pt0, pt1, uix1, cix1, Loc0, Loc1, dx, dy, NewCap, MinCap,
@@ -2707 +2702 @@
     StopTurn, FutureMCost, NewProject, OldImp, mix, V8, V21, AStr, DStr,
     ABaseDamage, DBaseDamage: integer;
-  CityReport, AltCityReport: TCityReport;
+  CityReport: TCityReport;
   FormerCLState: TCmdListState;
-  EndTime: int64;
   Adjacent: TVicinity8Loc;
   Radius: TVicinity21Loc;
@@ -4585 +4579 @@
 constructor TBrain.Create;
 begin
-  Picture := nil;
+  Picture := TDpiBitmap.Create;
+  Picture.SetSize(64, 64);
 end;
 
 destructor TBrain.Destroy;
 begin
-  if Assigned(Picture) then Picture.Free;
+  FreeAndNil(Picture);
   inherited Destroy;
 end;