Changeset 318 for trunk/LocalPlayer/Term.pas

Timestamp:

Mar 19, 2021, 12:32:32 PM (3 years ago)

Author:

chronos

Message:

• Modified: Defined and used more Templates graphic set items.
• Fixed: Incorrect evaluation of nil graphic set references.

File:

• trunk/LocalPlayer/Term.pas (modified) (14 diffs)

trunk/LocalPlayer/Term.pas

@@ -752 +752 @@
   for emix := 0 to MyRO.nEnemyModel - 1 do
     with MyRO.EnemyModel[emix] do
-      if Tribe[Owner].ModelPicture[mix].HGr = HGrSystem then
+      if not Assigned(Tribe[Owner].ModelPicture[mix].HGr) then
         InitEnemyModel(emix);
 end;
@@ -835 +835 @@
     while MyData.ToldModels < MyRO.nModel do
     begin { new Unit class available }
-      if (ModelPicture[MyData.ToldModels].HGr <> HGrSystem) and
+      if Assigned(ModelPicture[MyData.ToldModels].HGr) 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 := HGrSystem
+        ModelPicture[MyData.ToldModels].HGr := nil;
       end;
-      if ModelPicture[MyData.ToldModels].HGr = HGrSystem then
+      if not Assigned(ModelPicture[MyData.ToldModels].HGr) then
         InitMyModel(MyData.ToldModels, true);
       { only run if no researched model }
@@ -873 +873 @@
           Server(cSetModelName + (Length(ModelNameInfo.NewName) + 1 + 4 + 3)
             div 4, me, 0, ModelNameInfo);
-        end
+        end;
       end;
       if MyModel[MyData.ToldModels].Kind = mkSettler then
@@ -1043 +1043 @@
         DraftDlg.ShowNewContent(wmModal);
         if DraftDlg.ModalResult <> mrOK then
-          Tribe[me].ModelPicture[MyRO.nModel].HGr := HGrSystem
+          Tribe[me].ModelPicture[MyRO.nModel].HGr := nil
       end;
     until (ChosenResearch <> adMilitary) or (DraftDlg.ModalResult = mrOK);
@@ -2785 +2785 @@
               ItsMeAgain(p1);
               for mix := 0 to MyRO.nModel - 1 do
-                if Tribe[me].ModelPicture[mix].HGr = HGrSystem then
+                if not Assigned(Tribe[me].ModelPicture[mix].HGr) then
                   InitMyModel(mix, true);
             end;
@@ -3075 +3075 @@
         begin
           CurrentMoveInfo.DoShow := false;
-          if not idle and (Tribe[Owner].ModelPicture[mix].HGr = HGrSystem) then
+          if not idle and (not Assigned(Tribe[Owner].ModelPicture[mix].HGr)) then
             InitEnemyModel(emix);
 
@@ -3270 +3270 @@
           begin
             ToLoc := dLoc(FromLoc, dx, dy);
-            if Tribe[Owner].ModelPicture[mix].HGr = HGrSystem then
+            if not Assigned(Tribe[Owner].ModelPicture[mix].HGr) then
               InitEnemyModel(emix);
 
@@ -3403 +3403 @@
             if TribeOriginal[NewPlayer] then
               Tribe[NewPlayer].ModelName[mix] := NewName;
-      end
-  end
+      end;
+  end;
 end;
 
@@ -4859 +4859 @@
 
     // treasury section
-    ImageOp_BCC(TopBar, Templates.Data, xTreasurySection + 8, 1, 145, 1, 36, 36,
+    ImageOp_BCC(TopBar, Templates.Data, Point(xTreasurySection + 8, 1), TreasuryIcon.BoundsRect,
       $40A040, $4030C0);
     s := IntToStr(TrueMoney);
@@ -4866 +4866 @@
     if MyRO.Government <> gAnarchy then
     begin
-      ImageOp_BCC(TopBar, Templates.Data, xTreasurySection + 48, 22, 124, 1, 14, 14,
+      ImageOp_BCC(TopBar, Templates.Data, Point(xTreasurySection + 48, 22), ChangeIcon.BoundsRect,
         $0000C0, $0080C0);
       if TaxSum >= 0 then
@@ -4877 +4877 @@
 
     // research section
-    ImageOp_BCC(TopBar, Templates.Data, xResearchSection + 8, 1, 145, 75, 36, 36,
+    ImageOp_BCC(TopBar, Templates.Data, Point(xResearchSection + 8, 1), ResearchIcon.BoundsRect,
       $FF0000, $00FFE0);
     if MyData.FarTech <> adNexus then
@@ -4928 +4928 @@
     if (MyData.FarTech <> adNexus) and (ScienceSum > 0) then
     begin
-      ImageOp_BCC(TopBar, Templates.Data, xResearchSection + 48 + CostFactor + 11,
-        22, 124, 1, 14, 14, $0000C0, $0080C0);
+      ImageOp_BCC(TopBar, Templates.Data, Point(xResearchSection + 48 + CostFactor + 11,
+        22), ChangeIcon.BoundsRect, $0000C0, $0080C0);
       s := Format(Phrases.Lookup('TECHGAIN'), [ScienceSum]);
       LoweredTextOut(TopBar.Canvas, -1, MainTexture, xResearchSection + 48 +
@@ -5353 +5353 @@
               MyRO.EnemyModel[emix].mix, MouseLoc) >= rExecuted) then
             begin
-              if Tribe[p1].ModelPicture[MyRO.EnemyModel[emix].mix].HGr = HGrSystem then
+              if not Assigned(Tribe[p1].ModelPicture[MyRO.EnemyModel[emix].mix].HGr) then
                 InitEnemyModel(emix);
               m2 := TMenuItem.Create(m);
@@ -6447 +6447 @@
     SumCities(TaxSum, ScienceSum);
     for i := 0 to MyRO.nModel - 1 do
-      if Tribe[me].ModelPicture[i].HGr = HGrSystem then
+      if not Assigned(Tribe[me].ModelPicture[i].HGr) then
         InitMyModel(i, True);