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

trunk/LocalPlayer/CityScreen.pas

@@ -387 +387 @@
     if Kind = 3 then
     begin
-      Tex.clBevelLight := GrExt[HGrSystem].Data.Canvas.Pixels[104, 36];
+      Tex.clBevelLight := HGrSystem.Data.Canvas.Pixels[104, 36];
       Tex.clBevelShade := Tex.clBevelLight;
     end;
@@ -624 +624 @@
       xGr := 141;
     BitBltCanvas(offscreen.Canvas, xmArea - 192 + 5 + i * d, ymArea - 96 - 29,
-      27, 30, GrExt[HGrSystem].Mask.Canvas, xGr, 171, SRCAND); { shadow }
+      27, 30, HGrSystem.Mask.Canvas, xGr, 171, SRCAND); { shadow }
     Sprite(offscreen, HGrSystem, xmArea - 192 + 4 + i * d, ymArea - 96 - 30, 27,
       30, xGr, 171);
@@ -636 +636 @@
     xGr := 1 + 112;
     BitBltCanvas(offscreen.Canvas, xmArea + 192 - 27 + 1 - i * d, 29 + 1, 27,
-      30, GrExt[HGrSystem].Mask.Canvas, xGr, 171, SRCAND); { shadow }
+      30, HGrSystem.Mask.Canvas, xGr, 171, SRCAND); { shadow }
     Sprite(offscreen, HGrSystem, xmArea + 192 - 27 - i * d, 29, 27, 30,
       xGr, 171);
@@ -1052 +1052 @@
         (integer(MyRO.EnemyModel[emix].mix) <> c.Project and cpIndex)) do
         dec(emix);
-      if Tribe[cOwner].ModelPicture[c.Project and cpIndex].HGr = 0 then
+      if Tribe[cOwner].ModelPicture[c.Project and cpIndex].HGr = HGrSystem then
         InitEnemyModel(emix);
     end;