Changeset 318 for trunk/Packages

Timestamp:

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

Author:

chronos

Message:

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

File:

• trunk/Packages/CevoComponents/ScreenTools.pas (modified) (5 diffs)

trunk/Packages/CevoComponents/ScreenTools.pas

@@ -102 +102 @@
   Kind, x, y, size, pos, Growth, max: integer; IndicateComplete: boolean;
   const T: TTexture);
-procedure PaintLogo(ca: TCanvas; x, y, clLight, clShade: integer);
+procedure PaintLogo(Canvas: TCanvas; X, Y, LightColor, ShadeColor: integer);
 function SetMainTextureByAge(Age: integer): boolean;
 procedure LoadPhrases;
@@ -164 +164 @@
   HGrSystem: TGraphicSet;
   HGrSystem2: TGraphicSet;
-  CityMark1: TGraphicSetItem;
-  CityMark2: TGraphicSetItem;
-  Ornament: TGraphicSetItem;
-  Logo: TGraphicSetItem;
-  BigBook: TGraphicSetItem;
-  SmallBook: TGraphicSetItem;
-  MenuLogo: TGraphicSetItem;
   ClickFrameColor: Integer;
   MainTextureAge: Integer;
@@ -183 +176 @@
   InitOrnamentDone: Boolean;
   Phrases2FallenBackToEnglish: Boolean;
+
+  // Graphic set items
+  CityMark1: TGraphicSetItem;
+  CityMark2: TGraphicSetItem;
+  Ornament: TGraphicSetItem;
+  Logo: TGraphicSetItem;
+  BigBook: TGraphicSetItem;
+  SmallBook: TGraphicSetItem;
+  MenuLogo: TGraphicSetItem;
+  LinkArrows: TGraphicSetItem;
+  ScienceNationDot: TGraphicSetItem;
+  ResearchIcon: TGraphicSetItem;
+  ChangeIcon: TGraphicSetItem;
+  TreasuryIcon: TGraphicSetItem;
+  StarshipDeparted: TGraphicSetItem;
+  WeightOn: TGraphicSetItem;
+  WeightOff: TGraphicSetItem;
 
   UniFont: array [TFontType] of TFont;
@@ -1502 +1512 @@
 end;
 
-procedure PaintLogo(ca: TCanvas; x, y, clLight, clShade: Integer);
+procedure PaintLogo(Canvas: TCanvas; X, Y, LightColor, ShadeColor: Integer);
 begin
   // TODO: Explicitly clear background to black but in fact BitBlt SRCCOPY should do it
   LogoBuffer.Canvas.FillRect(0, 0, LogoBuffer.Width, LogoBuffer.Height);
-  BitBltCanvas(LogoBuffer.Canvas, 0, 0, Logo.Width, Logo.Height, ca, x, y);
+  BitBltCanvas(LogoBuffer.Canvas, 0, 0, Logo.Width, Logo.Height, Canvas, X, Y);
   ImageOp_BCC(LogoBuffer, Templates.Data, Point(0, 0), Logo.BoundsRect,
-    clLight, clShade);
-  BitBltCanvas(ca, x, y, Logo.Width, Logo.Height, LogoBuffer.Canvas, 0, 0);
+    LightColor, ShadeColor);
+  BitBltCanvas(Canvas, X, Y, Logo.Width, Logo.Height, LogoBuffer.Canvas, 0, 0);
 end;
 
@@ -1690 +1700 @@
   LoadFonts;
   Templates := LoadGraphicSet2('Templates.png');
-  Logo := Templates.GetItem('Logo');
-  BigBook := Templates.GetItem('BigBook');
-  SmallBook := Templates.GetItem('SmallBook');
-  MenuLogo := Templates.GetItem('MenuLogo');
+  with Templates do begin
+    Logo := GetItem('Logo');
+    BigBook := GetItem('BigBook');
+    SmallBook := GetItem('SmallBook');
+    MenuLogo := GetItem('MenuLogo');
+    LinkArrows := GetItem('LinkArrows');
+    ScienceNationDot := GetItem('ScienceNationDot');
+    ResearchIcon := GetItem('Research');
+    ChangeIcon := GetItem('Change');
+    TreasuryIcon := GetItem('Treasury');
+    StarshipDeparted := GetItem('StarshipDeparted');
+    WeightOn := GetItem('WeightOn');
+    WeightOff := GetItem('WeightOff');
+  end;
+
   LoadGraphicFile(Colors, GetGraphicsDir + DirectorySeparator + 'Colors.png');
   LoadGraphicFile(Paper, GetGraphicsDir + DirectorySeparator + 'Paper.jpg');