Changeset 417 for trunk/Start.pas

Timestamp:

Nov 17, 2021, 11:11:01 AM (3 years ago)

Author:

chronos

Message:

• Modified: Merged LoadGraphicSet and LoadGraphicSet2 into single method.
• Modified: Moved brain load picture code into TBrain.LoadPicture method.
• Added: Brain pictures loaded as TGraphicSetItem.
• Modified: Code cleanup.

File:

• trunk/Start.pas (modified) (5 diffs)

trunk/Start.pas

@@ -10 +10 @@
 
 type
-
   { TPlayerSlot }
 
@@ -295 +294 @@
     CustomizeBtn.ButtonIndex := 2;
 
-  BitBltBitmap(BrainNoTerm.Picture, 0, 0, 64, 64, HGrSystem2.Data, 1, 111);
-  BitBltBitmap(BrainSuperVirtual.Picture, 0, 0, 64, 64, HGrSystem2.Data, 66, 111);
-  BitBltBitmap(BrainTerm.Picture, 0, 0, 64, 64, HGrSystem2.Data, 131, 111);
-  BitBltBitmap(BrainRandom.Picture, 0, 0, 64, 64, HGrSystem2.Data, 131, 46);
+  BitBltBitmap(BrainNoTerm.Picture, 0, 0, 64, 64, HGrSystem2.Data, GBrainNoTerm.Left, GBrainNoTerm.Top);
+  BitBltBitmap(BrainSuperVirtual.Picture, 0, 0, 64, 64, HGrSystem2.Data, GBrainSuperVirtual.Left, GBrainSuperVirtual.Top);
+  BitBltBitmap(BrainTerm.Picture, 0, 0, 64, 64, HGrSystem2.Data, GBrainTerm.Left, GBrainTerm.Top);
+  BitBltBitmap(BrainRandom.Picture, 0, 0, 64, 64, HGrSystem2.Data, GBrainRandom.Left, GBrainRandom.Top);
+
   LoadAiBrainsPictures;
 
@@ -480 +480 @@
 procedure TStartDlg.LoadAiBrainsPictures;
 var
-  AIBrains: TBrains;
-  I: Integer;
-  TextSize: TSize;
-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;
-        TextSize := TextExtent(FileName);
-        Textout(32 - TextSize.Width div 2,
-          32 - TextSize.Height div 2, FileName);
-      end;
-    end;
-  end;
-  FreeAndNil(AIBrains);
+  AiBrains: TBrains;
+begin
+  AiBrains := TBrains.Create(False);
+  try
+    Brains.GetByKind(btAI, AiBrains);
+    AiBrains.LoadPictures;
+  finally
+    FreeAndNil(AiBrains);
+  end;
 end;
 
@@ -727 +713 @@
     begin
       for i := 12 to 19 do
-        if (i < 13) or (i > 17) then
-        begin
+        if (i < 13) or (i > 17) then begin
           BitBltCanvas(Canvas, 9 + i * 27, yLogo - 2, Ornament.Width, Ornament.Height,
             HGrSystem2.Mask.Canvas, Ornament.Left, Ornament.Top, SRCAND);
@@ -813 +798 @@
 
       for i := 0 to 19 do
-        if (i < 2) or (i > 6) then
-        begin
+        if (i < 2) or (i > 6) then begin
           BitBltCanvas(Canvas, 9 + i * 27, yLogo - 2, Ornament.Width, Ornament.Height,
             HGrSystem2.Mask.Canvas, Ornament.Left, Ornament.Top, SRCAND);