Changeset 315 for trunk/LocalPlayer/Term.pas

Timestamp:

Mar 18, 2021, 10:58:28 PM (3 years ago)

Author:

chronos

Message:

• Fixed: Gamma was incorrectly applied to images with transparency colors.
• Modified: Change Templates to GraphicSet so it can also have description of its items.
• Modified: Use TextExtent instead of both TextWidth and TextHeight.

File:

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

trunk/LocalPlayer/Term.pas

@@ -2547 +2547 @@
           Jump[0] := 999999;
         GameMode := Command;
-        for i := 0 to GrExt.Count - 1 do
-          GrExt[i].ResetPixUsed;
+        GrExt.ResetPixUsed;
         IsoEngine.Reset;
         Tribes.Init;
@@ -3512 +3511 @@
   Canvas.Font.Assign(UniFont[ftSmall]);
   InitButtons;
-  EOT.Template := Templates;
+  EOT.Template := Templates.Data;
 end;
 
@@ -4844 +4843 @@
   end;
   if GameMode <> cMovie then
-    ImageOp_BCC(TopBar, Templates, 2, 1, 145, 38, 36, 36, $BFBF20, $4040DF);
+    ImageOp_BCC(TopBar, Templates.Data, 2, 1, 145, 38, 36, 36, $BFBF20, $4040DF);
   if MyRO.nCity > 0 then
   begin
@@ -4860 +4859 @@
 
     // treasury section
-    ImageOp_BCC(TopBar, Templates, xTreasurySection + 8, 1, 145, 1, 36, 36,
+    ImageOp_BCC(TopBar, Templates.Data, xTreasurySection + 8, 1, 145, 1, 36, 36,
       $40A040, $4030C0);
     s := IntToStr(TrueMoney);
@@ -4867 +4866 @@
     if MyRO.Government <> gAnarchy then
     begin
-      ImageOp_BCC(TopBar, Templates, xTreasurySection + 48, 22, 124, 1, 14, 14,
+      ImageOp_BCC(TopBar, Templates.Data, xTreasurySection + 48, 22, 124, 1, 14, 14,
         $0000C0, $0080C0);
       if TaxSum >= 0 then
@@ -4878 +4877 @@
 
     // research section
-    ImageOp_BCC(TopBar, Templates, xResearchSection + 8, 1, 145, 75, 36, 36,
+    ImageOp_BCC(TopBar, Templates.Data, xResearchSection + 8, 1, 145, 75, 36, 36,
       $FF0000, $00FFE0);
     if MyData.FarTech <> adNexus then
@@ -4929 +4928 @@
     if (MyData.FarTech <> adNexus) and (ScienceSum > 0) then
     begin
-      ImageOp_BCC(TopBar, Templates, xResearchSection + 48 + CostFactor + 11,
+      ImageOp_BCC(TopBar, Templates.Data, xResearchSection + 48 + CostFactor + 11,
         22, 124, 1, 14, 14, $0000C0, $0080C0);
       s := Format(Phrases.Lookup('TECHGAIN'), [ScienceSum]);