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

trunk/LocalPlayer/Term.pas

@@ -445 +445 @@
   SoundPreloadDone: Integer;
   MarkCityLoc: Integer;
-  HGrTerrain: Integer;
-  HGrCities: Integer;
+  HGrTerrain: TGrExtDescr;
+  HGrCities: TGrExtDescr;
   MovieSpeed: Integer;
   CityRepMask: Cardinal;
@@ -751 +751 @@
   for emix := 0 to MyRO.nEnemyModel - 1 do
     with MyRO.EnemyModel[emix] do
-      if Tribe[Owner].ModelPicture[mix].HGr = 0 then
+      if Tribe[Owner].ModelPicture[mix].HGr = HGrSystem then
         InitEnemyModel(emix);
 end;
@@ -834 +834 @@
     while MyData.ToldModels < MyRO.nModel do
     begin { new Unit class available }
-      if (ModelPicture[MyData.ToldModels].HGr > 0) and
+      if (ModelPicture[MyData.ToldModels].HGr <> HGrSystem) and
         (MyModel[MyData.ToldModels].Kind <> mkSelfDeveloped) then
       begin // save picture of DevModel
         ModelPicture[MyData.ToldModels + 1] := ModelPicture[MyData.ToldModels];
         ModelName[MyData.ToldModels + 1] := ModelName[MyData.ToldModels];
-        ModelPicture[MyData.ToldModels].HGr := 0
+        ModelPicture[MyData.ToldModels].HGr := HGrSystem
       end;
-      if ModelPicture[MyData.ToldModels].HGr = 0 then
+      if ModelPicture[MyData.ToldModels].HGr = HGrSystem then
         InitMyModel(MyData.ToldModels, true);
       { only run if no researched model }
@@ -1042 +1042 @@
         DraftDlg.ShowNewContent(wmModal);
         if DraftDlg.ModalResult <> mrOK then
-          Tribe[me].ModelPicture[MyRO.nModel].HGr := 0
+          Tribe[me].ModelPicture[MyRO.nModel].HGr := HGrSystem
       end;
     until (ChosenResearch <> adMilitary) or (DraftDlg.ModalResult = mrOK);
@@ -1603 +1603 @@
   for x := 0 to 11 do
     for y := 0 to 1 do
-      MiniColors[x, y] := GrExt[HGrSystem].Data.Canvas.Pixels[66 + x, 67 + y];
+      MiniColors[x, y] := HGrSystem.Data.Canvas.Pixels[66 + x, 67 + y];
   IsoEngine.Init(InitEnemyModel);
   if not IsoEngine.ApplyTileSize(xxt, yyt) and ((xxt <> 48) or (yyt <> 24) or (xxt <> 72))
@@ -2785 +2785 @@
               ItsMeAgain(p1);
               for mix := 0 to MyRO.nModel - 1 do
-                if Tribe[me].ModelPicture[mix].HGr = 0 then
+                if Tribe[me].ModelPicture[mix].HGr = HGrSystem then
                   InitMyModel(mix, true);
             end;
@@ -3075 +3075 @@
         begin
           CurrentMoveInfo.DoShow := false;
-          if not idle and (Tribe[Owner].ModelPicture[mix].HGr = 0) then
+          if not idle and (Tribe[Owner].ModelPicture[mix].HGr = HGrSystem) then
             InitEnemyModel(emix);
 
@@ -3270 +3270 @@
           begin
             ToLoc := dLoc(FromLoc, dx, dy);
-            if Tribe[Owner].ModelPicture[mix].HGr = 0 then
+            if Tribe[Owner].ModelPicture[mix].HGr = HGrSystem then
               InitEnemyModel(emix);
 
@@ -4073 +4073 @@
 begin
   if not Assigned(MyMap) then Exit;
-  cmPolOcean := GrExt[HGrSystem].Data.Canvas.Pixels[101, 67];
-  cmPolNone := GrExt[HGrSystem].Data.Canvas.Pixels[102, 67];
+  cmPolOcean := HGrSystem.Data.Canvas.Pixels[101, 67];
+  cmPolNone := HGrSystem.Data.Canvas.Pixels[102, 67];
   hw := MapWidth div (xxt * 2);
   with Mini.Canvas do begin
@@ -4400 +4400 @@
           $FFFFFF, $B0B0B0);
         BitBltCanvas(Panel.Canvas, ClientWidth - xPalace, yPalace, xSizeBig,
-          ySizeBig, GrExt[HGrSystem2].Data.Canvas, 70, 123);
+          ySizeBig, HGrSystem2.Data.Canvas, 70, 123);
       end
       else if MyRO.NatBuilt[imPalace] > 0 then
@@ -4615 +4615 @@
             BiColorTextWidth(Panel.Canvas, s) div 2, PanelHeight - 23, s);
 
-          FrameImage(Panel.Canvas, GrExt[HGrSystem].Data,
+          FrameImage(Panel.Canvas, HGrSystem.Data,
             xMidPanel + 7 + xUnitText, yTroop + 15, 12, 14,
             121 + Exp div ExpCost * 13, 28);
@@ -5353 +5353 @@
               MyRO.EnemyModel[emix].mix, MouseLoc) >= rExecuted) then
             begin
-              if Tribe[p1].ModelPicture[MyRO.EnemyModel[emix].mix].HGr = 0 then
+              if Tribe[p1].ModelPicture[MyRO.EnemyModel[emix].mix].HGr = HGrSystem then
                 InitEnemyModel(emix);
               m2 := TMenuItem.Create(m);
@@ -6436 +6436 @@
 procedure TMainScreen.SetViewpoint(p: integer);
 var
-  i: integer;
+  i: Integer;
 begin
   if supervising and (G.RO[0].Turn > 0) and
@@ -6447 +6447 @@
     SumCities(TaxSum, ScienceSum);
     for i := 0 to MyRO.nModel - 1 do
-      if Tribe[me].ModelPicture[i].HGr = 0 then
-        InitMyModel(i, true);
+      if Tribe[me].ModelPicture[i].HGr = HGrSystem then
+        InitMyModel(i, True);
 
     SetTroopLoc(-1);
     PanelPaint;
-    MapValid := false;
+    MapValid := False;
     PaintAllMaps;
   end;