Changeset 192

Timestamp:

May 7, 2020, 12:30:04 PM (4 years ago)

Author:

chronos

Message:

• Modified: Code cleanup.
• Modified: Simplified initialization of brain pictures.
• Modified: Use GetAiDir function for AI subdirectory.

Location:

trunk

Files:

• GameServer.pas (modified) (4 diffs)
• Packages/CevoComponents/Directories.pas (modified) (2 diffs)
• Packages/CevoComponents/ScreenTools.pas (modified) (10 diffs)
• Start.pas (modified) (7 diffs)

trunk/GameServer.pas

@@ -122 +122 @@
   Directories, CityProcessing, UnitProcessing, CmdList, LCLIntf, LCLType,
   LMessages, Classes, SysUtils;
+
+resourcestring
+  SNoAiFound = 'No AI libraries found in directory %s';
 
 var
@@ -256 +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;
@@ -272 +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;
 
@@ -4584 +4587 @@
 constructor TBrain.Create;
 begin
-  Picture := nil;
+  Picture := TBitmap.Create;
+  Picture.SetSize(64, 64);
 end;
 
 destructor TBrain.Destroy;
 begin
-  if Assigned(Picture) then Picture.Free;
+  FreeAndNil(Picture);
   inherited Destroy;
 end;

trunk/Packages/CevoComponents/Directories.pas

@@ -15 +15 @@
 function GetGraphicsDir: string;
 function GetSoundsDir: string;
+function GetAiDir: string;
 
 
@@ -126 +127 @@
 end;
 
+function GetAiDir: string;
+begin
+  Result := HomeDir + 'AI';
+end;
+
 end.

trunk/Packages/CevoComponents/ScreenTools.pas

@@ -7 +7 @@
   Windows,
   {$ENDIF}
-  StringTables, LCLIntf, LCLType, SysUtils, Classes, Graphics, Controls,
+  StringTables, LCLIntf, LCLType, SysUtils, Classes, Graphics, Controls, Math,
   Forms, Menus, GraphType;
 
@@ -35 +35 @@
 procedure Sprite(dst: TBitmap; HGr, xDst, yDst, Width, Height, xGr, yGr: integer);
   overload;
-procedure MakeBlue(dst: TBitmap; x, y, w, h: integer);
+procedure MakeBlue(dst: TBitmap; x, y, Width, Height: Integer);
 procedure ImageOp_B(dst, Src: TBitmap; xDst, yDst, xSrc, ySrc, w, h: integer);
 procedure ImageOp_BCC(dst, Src: TBitmap;
@@ -41 +41 @@
 procedure ImageOp_CCC(bmp: TBitmap; x, y, w, h, Color0, Color1, Color2: integer);
 function BitBltCanvas(DestCanvas: TCanvas; X, Y, Width, Height: Integer;
-  SrcCanvas: TCanvas; XSrc, YSrc: Integer; Rop: DWORD = SRCCOPY): Boolean;
+  SrcCanvas: TCanvas; XSrc, YSrc: Integer; Rop: DWORD = SRCCOPY): Boolean; overload;
+function BitBltCanvas(Dest: TCanvas; DestRect: TRect;
+  Src: TCanvas; SrcPos: TPoint; Rop: DWORD = SRCCOPY): Boolean; overload;
+function BitBltBitmap(Dest: TBitmap; X, Y, Width, Height: Integer;
+  Src: TBitmap; XSrc, YSrc: Integer; Rop: DWORD = SRCCOPY): Boolean; overload;
+function BitBltBitmap(Dest: TBitmap; DestRect: TRect;
+  Src: TBitmap; SrcPos: TPoint; Rop: DWORD = SRCCOPY): Boolean; overload;
 procedure SLine(ca: TCanvas; x0, x1, y: integer; cl: TColor);
 procedure DLine(ca: TCanvas; x0, x1, y: integer; cl0, cl1: TColor);
@@ -52 +58 @@
 procedure InitOrnament;
 procedure InitCityMark(const T: TTexture);
-procedure Fill(ca: TCanvas; Left, Top, Width, Height, xOffset, yOffset: integer);
+procedure Fill(ca: TCanvas; Left, Top, Width, Height, xOffset, yOffset: integer); overload;
+procedure Fill(Canvas: TCanvas; Rect: TRect; Offset: TPoint); overload;
 procedure FillLarge(ca: TCanvas; x0, y0, x1, y1, xm: integer);
 procedure FillSeamless(ca: TCanvas; Left, Top, Width, Height, xOffset, yOffset: integer;
@@ -82 +89 @@
 procedure LoadPhrases;
 procedure Texturize(Dest, Texture: TBitmap; TransparentColor: Integer);
+procedure DarkenImage(Bitmap: TBitmap; Change: Integer);
 
 const
@@ -527 +535 @@
 end;
 
-procedure MakeBlue(dst: TBitmap; x, y, w, h: integer);
+procedure MakeBlue(dst: TBitmap; x, y, Width, Height: Integer);
 var
   XX, YY: integer;
@@ -534 +542 @@
   Dst.BeginUpdate;
   PixelPtr.Init(Dst, X, Y);
-  for yy := 0 to h - 1 do begin
-    for xx := 0 to w - 1 do begin
+  for yy := 0 to Height - 1 do begin
+    for xx := 0 to Width - 1 do begin
       PixelPtr.Pixel^.B := PixelPtr.Pixel^.B div 2;
       PixelPtr.Pixel^.G := PixelPtr.Pixel^.G div 2;
@@ -730 +738 @@
     Result := True;
   end else Result := BitBlt(DestCanvas.Handle, X, Y, Width, Height, SrcCanvas.Handle, XSrc, YSrc, Rop);
+end;
+
+function BitBltCanvas(Dest: TCanvas; DestRect: TRect; Src: TCanvas;
+  SrcPos: TPoint; Rop: DWORD): Boolean;
+begin
+  Result := BitBltCanvas(Dest, DestRect.Left, DestRect.Top, DestRect.Width, DestRect.Height,
+    Src, SrcPos.X, SrcPos.Y, Rop);
+end;
+
+function BitBltBitmap(Dest: TBitmap; X, Y, Width, Height: Integer;
+  Src: TBitmap; XSrc, YSrc: Integer; Rop: DWORD): Boolean;
+begin
+  Result := BitBltCanvas(Dest.Canvas, X, Y, Width, Height, Src.Canvas, XSrc, YSrc, Rop);
+end;
+
+function BitBltBitmap(Dest: TBitmap; DestRect: TRect; Src: TBitmap;
+  SrcPos: TPoint; Rop: DWORD): Boolean;
+begin
+  Result := BitBltCanvas(Dest.Canvas, DestRect, Src.Canvas, SrcPos, Rop);
 end;
 
@@ -901 +928 @@
   BitBltCanvas(ca, Left, Top, Width, Height, MainTexture.Image.Canvas,
     Left + xOffset, Top + yOffset);
+end;
+
+procedure Fill(Canvas: TCanvas; Rect: TRect; Offset: TPoint);
+begin
+  Fill(Canvas, Rect.Left, Rect.Top, Rect.Width, Rect.Height, Offset.X, Offset.Y);
 end;
 
@@ -1426 +1458 @@
 end;
 
+procedure DarkenImage(Bitmap: TBitmap; Change: Integer);
+var
+  x, y: integer;
+  PicturePixel: TPixelPointer;
+begin
+  Bitmap.BeginUpdate;
+  PicturePixel.Init(Bitmap);
+  for y := 0 to Bitmap.Height - 1 do begin
+    for x := 0 to Bitmap.Width - 1 do begin
+      PicturePixel.Pixel^.B := Max(PicturePixel.Pixel^.B - Change, 0);
+      PicturePixel.Pixel^.G := Max(PicturePixel.Pixel^.G - Change, 0);
+      PicturePixel.Pixel^.R := Max(PicturePixel.Pixel^.R - Change, 0);
+      PicturePixel.NextPixel;
+    end;
+    PicturePixel.NextLine;
+  end;
+  Bitmap.EndUpdate;
+end;
+
 procedure LoadFonts;
 var

trunk/Start.pas

@@ -154 +154 @@
     procedure LoadConfig;
     procedure SaveConfig;
+    procedure LoadAiBrainsPictures;
   end;
 
@@ -433 +434 @@
   r0, r1: HRgn;
   Location: TPoint;
+  PlayerSlot: TPlayerSlot;
   AIBrains: TBrains;
-  PlayerSlot: TPlayerSlot;
 begin
   PlayerSlots := TPlayerSlots.Create;
@@ -528 +529 @@
     CustomizeBtn.ButtonIndex := 2;
 
-  Brains[0].Picture := TBitmap.Create;
-  Brains[0].Picture.SetSize(64, 64);
-  BitBltCanvas(Brains[0].Picture.Canvas, 0, 0, 64, 64,
-    GrExt[HGrSystem2].Data.Canvas, 1, 111);
-  Brains[1].Picture := TBitmap.Create;
-  Brains[1].Picture.SetSize(64, 64);
-  BitBltCanvas(Brains[1].Picture.Canvas, 0, 0, 64, 64,
-    GrExt[HGrSystem2].Data.Canvas, 66, 111);
-  Brains[2].Picture := TBitmap.Create;
-  Brains[2].Picture.SetSize(64, 64);
-  BitBltCanvas(Brains[2].Picture.Canvas, 0, 0, 64, 64,
-    GrExt[HGrSystem2].Data.Canvas, 131, 111);
-  Brains[3].Picture := TBitmap.Create;
-  Brains[3].Picture.SetSize(64, 64);
-  BitBltCanvas(Brains[3].Picture.Canvas, 0, 0, 64, 64,
-    GrExt[HGrSystem2].Data.Canvas, 131, 46);
-
-  AIBrains := TBrains.Create(False);
-  Brains.GetByKind(btAI, AIBrains);
-  for i := 0 to AIBrains.Count - 1 do
-  with AIBrains[I] do
-  begin
-    AIBrains[i].Picture := TBitmap.Create;
-    if not LoadGraphicFile(AIBrains[i].Picture, HomeDir + 'AI' + DirectorySeparator +
-      FileName + DirectorySeparator + FileName + '.png', gfNoError) then begin
-      AIBrains[i].Picture.SetSize(64, 64);
-      with AIBrains[i].Picture.Canvas do begin
-        Brush.Color := $904830;
-        FillRect(Rect(0, 0, 64, 64));
-        Font.Assign(UniFont[ftTiny]);
-        Font.Style := [];
-        Font.Color := $5FDBFF;
-        Textout(32 - TextWidth(FileName) div 2,
-          32 - TextHeight(FileName) div 2, FileName);
-      end;
-    end;
-  end;
-  AIBrains.Free;
+  BitBltBitmap(BrainNoTerm.Picture, 0, 0, 64, 64, GrExt[HGrSystem2].Data, 1, 111);
+  BitBltBitmap(BrainSuperVirtual.Picture, 0, 0, 64, 64, GrExt[HGrSystem2].Data, 66, 111);
+  BitBltBitmap(BrainTerm.Picture, 0, 0, 64, 64, GrExt[HGrSystem2].Data, 131, 111);
+  BitBltBitmap(BrainRandom.Picture, 0, 0, 64, 64, GrExt[HGrSystem2].Data, 131, 46);
+  LoadAiBrainsPictures;
 
   EmptyPicture := TBitmap.Create;
@@ -712 +680 @@
 end;
 
+procedure TStartDlg.LoadAiBrainsPictures;
+var
+  AIBrains: TBrains;
+  I: Integer;
+begin
+  AIBrains := TBrains.Create(False);
+  Brains.GetByKind(btAI, AIBrains);
+  for i := 0 to AIBrains.Count - 1 do
+  with AIBrains[I] do begin
+    if not LoadGraphicFile(AIBrains[i].Picture, GetAiDir + DirectorySeparator +
+      FileName + DirectorySeparator + FileName + '.png', gfNoError) then begin
+      with AIBrains[i].Picture.Canvas do begin
+        Brush.Color := $904830;
+        FillRect(Rect(0, 0, 64, 64));
+        Font.Assign(UniFont[ftTiny]);
+        Font.Style := [];
+        Font.Color := $5FDBFF;
+        Textout(32 - TextWidth(FileName) div 2,
+          32 - TextHeight(FileName) div 2, FileName);
+      end;
+    end;
+  end;
+  AIBrains.Free;
+end;
+
 procedure TStartDlg.DrawAction(y, IconIndex: integer; HeaderItem, TextItem: string);
 begin
@@ -828 +821 @@
   if Page = pgMain then
   begin
-    if SelectedAction >= maNone then // mark selected action
+    if SelectedAction <> maNone then // mark selected action
       for i := 0 to (ClientWidth - 2 * ActionSideBorder) div wBuffer + 1 do
       begin
@@ -852 +845 @@
       if MainAction in ActionsOffered then
         case MainAction of
-          maConfig:
-            DrawAction(y, 25, 'ACTIONHEADER_CONFIG', 'ACTION_CONFIG');
-          maManual:
-            DrawAction(y, 19, 'ACTIONHEADER_MANUAL', 'ACTION_MANUAL');
-          maCredits:
-            DrawAction(y, 22, 'ACTIONHEADER_CREDITS', 'ACTION_CREDITS');
-          maAIDev:
-            DrawAction(y, 24, 'ACTIONHEADER_AIDEV', 'ACTION_AIDEV');
+          maConfig: DrawAction(y, 25, 'ACTIONHEADER_CONFIG', 'ACTION_CONFIG');
+          maManual: DrawAction(y, 19, 'ACTIONHEADER_MANUAL', 'ACTION_MANUAL');
+          maCredits: DrawAction(y, 22, 'ACTIONHEADER_CREDITS', 'ACTION_CREDITS');
+          maAIDev: DrawAction(y, 24, 'ACTIONHEADER_AIDEV', 'ACTION_AIDEV');
           maWeb:
             begin
@@ -1095 +1084 @@
 
 procedure TStartDlg.FormShow(Sender: TObject);
-var
-  x, y: integer;
-  PicturePixel: TPixelPointer;
 begin
   SetMainTextureByAge(-1);
   List.Font.Color := MainTexture.clMark;
 
-  Fill(EmptyPicture.Canvas, 0, 0, 64, 64, (wMaintexture - 64) div 2,
-    (hMaintexture - 64) div 2);
-  // darken texture for empty slot
-  EmptyPicture.BeginUpdate;
-  PicturePixel.Init(EmptyPicture);
-  for y := 0 to 63 do begin
-    for x := 0 to 64 - 1 do begin
-      PicturePixel.Pixel^.B := Max(PicturePixel.Pixel^.B - 28, 0);
-      PicturePixel.Pixel^.G := Max(PicturePixel.Pixel^.G - 28, 0);
-      PicturePixel.Pixel^.R := Max(PicturePixel.Pixel^.R - 28, 0);
-      PicturePixel.NextPixel;
-    end;
-    PicturePixel.NextLine;
-  end;
-  EmptyPicture.EndUpdate;
+  Fill(EmptyPicture.Canvas, Bounds(0, 0, 64, 64),
+    Point((wMaintexture - 64) div 2, (hMaintexture - 64) div 2));
+
+  DarkenImage(EmptyPicture, 28);
 
   Difficulty[0] := Diff0;