Changeset 313 for trunk/Start.pas

Timestamp:

Mar 17, 2021, 11:11:55 AM (4 years ago)

Author:

chronos

Message:

• Modified: LoadGraphicSet now returns TGrExtDescr reference. Replaced integer index references to GrExt with with direct class reference to TGrExtDescr.

File:

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

trunk/Start.pas

@@ -236 +236 @@
   for X := 0 to 11 do
     for Y := 0 to 1 do
-      Colors[x, y] := GrExt[HGrSystem].Data.Canvas.Pixels[66 + x, 67 + y];
+      Colors[x, y] := HGrSystem.Data.Canvas.Pixels[66 + x, 67 + y];
 end;
 
@@ -381 +381 @@
   PrevMiniPixel: TPixelPointer;
 begin
-  OwnColor := GrExt[HGrSystem].Data.Canvas.Pixels[95, 67];
-  EnemyColor := GrExt[HGrSystem].Data.Canvas.Pixels[96, 67];
+  OwnColor := HGrSystem.Data.Canvas.Pixels[95, 67];
+  EnemyColor := HGrSystem.Data.Canvas.Pixels[96, 67];
   Bitmap.PixelFormat := pf24bit;
   Bitmap.SetSize(Size.X * 2, Size.Y);
@@ -479 +479 @@
   with PlayerSlots[i] do begin
     DiffUpBtn := TButtonC.Create(self);
-    DiffUpBtn.Graphic := GrExt[HGrSystem].Data;
+    DiffUpBtn.Graphic := HGrSystem.Data;
     DiffUpBtn.left := xBrain[i] - 18;
     DiffUpBtn.top := yBrain[i] + 39;
@@ -486 +486 @@
     DiffUpBtn.OnClick := DiffBtnClick;
     DiffDownBtn := TButtonC.Create(self);
-    DiffDownBtn.Graphic := GrExt[HGrSystem].Data;
+    DiffDownBtn.Graphic := HGrSystem.Data;
     DiffDownBtn.left := xBrain[i] - 18;
     DiffDownBtn.top := yBrain[i] + 51;
@@ -496 +496 @@
   with PlayerSlots[i] do begin
     MultiBtn := TButtonC.Create(self);
-    MultiBtn.Graphic := GrExt[HGrSystem].Data;
+    MultiBtn.Graphic := HGrSystem.Data;
     MultiBtn.left := xBrain[i] - 18;
     MultiBtn.top := yBrain[i];
@@ -511 +511 @@
     CustomizeBtn.ButtonIndex := 2;
 
-  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);
+  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);
   LoadAiBrainsPictures;
 
@@ -907 +907 @@
         begin
           BitBltCanvas(Canvas, 9 + i * 27, yLogo - 2, wOrna, hOrna,
-            GrExt[HGrSystem2].Mask.Canvas, xOrna, yOrna, SRCAND);
+            HGrSystem2.Mask.Canvas, xOrna, yOrna, SRCAND);
           BitBltCanvas(Canvas, 9 + i * 27, yLogo - 2, wOrna, hOrna,
-            GrExt[HGrSystem2].Data.Canvas, xOrna, yOrna, SRCPAINT);
+            HGrSystem2.Data.Canvas, xOrna, yOrna, SRCPAINT);
         end;
       PaintLogo(Canvas, 69 + 11 * 27, yLogo, MainTexture.clBevelLight,
@@ -926 +926 @@
           begin
             BitBltCanvas(Canvas, xBrain[i] - 18, yBrain[i] + 19, 12, 14,
-              GrExt[HGrSystem].Data.Canvas, 134 + (Difficulty[i] - 1) *
+              HGrSystem.Data.Canvas, 134 + (Difficulty[i] - 1) *
               13, 28);
             Frame(Canvas, xBrain[i] - 19, yBrain[i] + 18, xBrain[i] - 18 + 12,
@@ -946 +946 @@
                 MainTexture.clBevelShade, MainTexture.clBevelLight);
               BitBltCanvas(Canvas, xBrain[i] - 31, yBrain[i], 13, 12,
-                GrExt[HGrSystem].Data.Canvas, 88, 47);
+                HGrSystem.Data.Canvas, 88, 47);
             end;
           end;
@@ -991 +991 @@
         begin
           BitBltCanvas(Canvas, 9 + i * 27, yLogo - 2, wOrna, hOrna,
-            GrExt[HGrSystem2].Mask.Canvas, xOrna, yOrna, SRCAND);
+            HGrSystem2.Mask.Canvas, xOrna, yOrna, SRCAND);
           BitBltCanvas(Canvas, 9 + i * 27, yLogo - 2, wOrna, hOrna,
-            GrExt[HGrSystem2].Data.Canvas, xOrna, yOrna, SRCPAINT);
+            HGrSystem2.Data.Canvas, xOrna, yOrna, SRCPAINT);
         end;
       PaintLogo(Canvas, 69, yLogo, MainTexture.clBevelLight,