Changeset 349 for branches/highdpi/LocalPlayer/Tribes.pas

Timestamp:

Apr 6, 2021, 8:11:02 PM (4 years ago)

Author:

chronos

Message:

• Modified: Merged trunk branch version r348 into highdpi branch.

File:

• branches/highdpi/LocalPlayer/Tribes.pas (modified) (14 diffs)

branches/highdpi/LocalPlayer/Tribes.pas

@@ -5 +5 @@
 
 uses
-  Protocol, ScreenTools, LazFileUtils, Classes, Graphics, SysUtils, Global;
+  Protocol, ScreenTools, LazFileUtils, Classes, Graphics, SysUtils, Global,
+  UGraphicSet;
 
 type
@@ -14 +15 @@
 
   TModelPicture = record
-    HGr: Integer;
+    HGr: TGraphicSet;
     pix: Integer;
     xShield: Integer;
@@ -29 +30 @@
 
   TTribe = class
-    symHGr: Integer;
+    symHGr: TGraphicSet;
     sympix: Integer;
-    faceHGr: Integer;
+    faceHGr: TGraphicSet;
     facepix: Integer;
-    cHGr: Integer;
+    cHGr: TGraphicSet;
     cpix: Integer;
     // symbol and city graphics
@@ -62 +63 @@
 var
   Tribe: array [0 .. nPl - 1] of TTribe;
-  HGrStdUnits: Integer;
+  HGrStdUnits: TGraphicSet;
 
 procedure Init;
@@ -70 +71 @@
 procedure FindStdModelPicture(Code: Integer; var pix: Integer; var Name: string);
 function GetTribeInfo(FileName: string; var Name: string; var Color: TColor): Boolean;
-procedure FindPosition(HGr, x, y, xmax, ymax: Integer; Mark: TColor;
+procedure FindPosition(HGr: TGraphicSet; x, y, xmax, ymax: Integer; Mark: TColor;
   var xp, yp: Integer);
 
@@ -82 +83 @@
   TChosenModelPictureInfo = record
     Hash: Integer;
-    HGr: Integer;
+    HGr: TGraphicSet;
     pix: Integer;
     ModelName: ShortString;
@@ -328 +329 @@
 end;
 
-procedure FindPosition(HGr, x, y, xmax, ymax: Integer; Mark: TColor;
+procedure FindPosition(HGr: TGraphicSet; x, y, xmax, ymax: Integer; Mark: TColor;
   var xp, yp: Integer);
 begin
   xp := 0;
-  while (xp < xmax) and (GrExt[HGr].Data.Canvas.Pixels[x + 1 + xp, y] <> Mark) do
+  while (xp < xmax) and (HGr.Data.Canvas.Pixels[x + 1 + xp, y] <> Mark) do
     Inc(xp);
   yp := 0;
-  while (yp < ymax) and (GrExt[HGr].Data.Canvas.Pixels[x, y + 1 + yp] <> Mark) do
+  while (yp < ymax) and (HGr.Data.Canvas.Pixels[x, y + 1 + yp] <> Mark) do
     Inc(yp);
 end;
@@ -447 +448 @@
       end
       else
-        cHGr := -1;
+        cHGr := nil;
 
 {$IFNDEF SCR}
@@ -454 +455 @@
       Item := Get;
       if Item = '' then
-        faceHGr := -1
+        faceHGr := nil
       else
       begin
         faceHGr := LoadGraphicSet(Item + '.png');
         facepix := GetNum;
-        if GrExt[faceHGr].Data.Canvas.Pixels[facepix mod 10 * 65,
+        if faceHGr.Data.Canvas.Pixels[facepix mod 10 * 65,
           facepix div 10 * 49 + 48] = $00FFFF then
         begin // generate shield picture
-          GrExt[faceHGr].Data.Canvas.Pixels[facepix mod 10 * 65,
+          faceHGr.Data.Canvas.Pixels[facepix mod 10 * 65,
             facepix div 10 * 49 + 48] := $000000;
           Gray := $B8B8B8;
-          ImageOp_BCC(GrExt[faceHGr].Data, Templates,
+          ImageOp_BCC(faceHGr.Data, Templates.Data,
             facepix mod 10 * 65 + 1, facepix div 10 * 49 + 1, 1, 25, 64, 48,
             Gray, Color);
@@ -500 +501 @@
         HGr := LoadGraphicSet(GrName);
         pix := Info.pix;
-        Inc(GrExt[HGr].pixUsed[pix]);
+        Inc(HGr.pixUsed[pix]);
       end;
       ModelName[mix] := '';
@@ -558 +559 @@
   Code, Turn: Integer; ForceNew: Boolean): Boolean;
 var
-  i, Cnt, HGr, Used, LeastUsed: Integer;
+  i: Integer;
+  Cnt: Integer;
+  HGr: TGraphicSet;
+  Used: Integer;
+  LeastUsed: Integer;
   TestPic: TModelPictureInfo;
   ok: Boolean;
@@ -567 +572 @@
     if Code = GetNum then
     begin
-      if ForceNew or (HGr < 0) then
+      if ForceNew or (not Assigned(HGr)) then
         Used := 0
       else
       begin
-        Used := 4 * GrExt[HGr].pixUsed[TestPic.pix];
+        Used := 4 * HGr.pixUsed[TestPic.pix];
         if HGr = HGrStdUnits then
           Inc(Used, 2); // prefer units not from StdUnits
@@ -596 +601 @@
       if PictureList[i].Hash = Picture.Hash then
       begin
-        Picture.GrName := GrExt[PictureList[i].HGr].Name;
+        Picture.GrName := PictureList[i].HGr.Name;
         Picture.pix := PictureList[i].pix;
         Result := False;
@@ -623 +628 @@
       ok := True;
       TestPic.GrName := Copy(Input, 8, 255) + '.png';
-      HGr := nGrExt - 1;
-      while (HGr >= 0) and (GrExt[HGr].Name <> TestPic.GrName) do
-        Dec(HGr);
+      HGr := GrExt.SearchByName(TestPic.GrName);
     end
     else if (Input <> '') and (Input[1] = '#') then