Changeset 313 for trunk/LocalPlayer/MessgEx.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/LocalPlayer/MessgEx.pas (modified) (4 diffs)

trunk/LocalPlayer/MessgEx.pas

@@ -149 +149 @@
       begin
         Tribe[IconIndex].InitAge(GetAge(IconIndex));
-        if Tribe[IconIndex].faceHGr >= 0 then
-          TopSpace := 64
+        if Assigned(Tribe[IconIndex].faceHGr) then
+          TopSpace := 64;
       end;
     mikFullControl:
@@ -336 +336 @@
       with MyRO.EnemyModel[emix], Tribe[Owner].ModelPicture[mix] do
       begin
-        BitBltCanvas(Canvas, x, y, 64, 48, GrExt[HGr].Mask.Canvas,
+        BitBltCanvas(Canvas, x, y, 64, 48, HGr.Mask.Canvas,
           pix mod 10 * 65 + 1, pix div 10 * 49 + 1, SRCAND);
-        BitBltCanvas(Canvas, x, y, 64, 48, GrExt[HGr].Data.Canvas,
+        BitBltCanvas(Canvas, x, y, 64, 48, HGr.Data.Canvas,
           pix mod 10 * 65 + 1, pix div 10 * 49 + 1, SRCPAINT);
       end;
@@ -411 +411 @@
           ySizeBig, 0, 0);
         BitBltCanvas(Canvas, ClientWidth div 2 - 32, 20, 64, 44,
-          GrExt[HGr].Mask.Canvas, pix mod 10 * 65 + 1,
+          HGr.Mask.Canvas, pix mod 10 * 65 + 1,
           pix div 10 * 49 + 1, SRCAND);
         BitBltCanvas(Canvas, ClientWidth div 2 - 32, 20, 64, 44,
-          GrExt[HGr].Data.Canvas, pix mod 10 * 65 + 1,
+          HGr.Data.Canvas, pix mod 10 * 65 + 1,
           pix div 10 * 49 + 1, SRCPAINT);
       end;
@@ -421 +421 @@
         MainTexture.clCover);
     mikTribe:
-      if Tribe[IconIndex].faceHGr >= 0 then
+      if Assigned(Tribe[IconIndex].faceHGr) then
       begin
         Frame(Canvas, ClientWidth div 2 - 32 - 1, 24 - 1,
           ClientWidth div 2 + 32, 24 + 48, $000000, $000000);
         BitBltCanvas(Canvas, ClientWidth div 2 - 32, 24, 64, 48,
-          GrExt[Tribe[IconIndex].faceHGr].Data.Canvas,
+          Tribe[IconIndex].faceHGr.Data.Canvas,
           1 + Tribe[IconIndex].facepix mod 10 * 65,
           1 + Tribe[IconIndex].facepix div 10 * 49)