Changeset 715 for trunk/LocalPlayer

Timestamp:

Jan 4, 2026, 6:07:38 PM (4 weeks ago)

Author:

chronos

Message:

• Modified: Do not store .png file extension in graphics names in book files. This is for compatibility with older C-evo versions.

Location:

trunk/LocalPlayer

Files:

• CityScreen.pas (modified) (1 diff)
• Draft.pas (modified) (1 diff)
• Help.pas (modified) (1 diff)
• IsoEngine.pas (modified) (2 diffs)
• NatStat.pas (modified) (1 diff)
• TechTree.pas (modified) (1 diff)
• Term.pas (modified) (5 diffs)
• Tribes.pas (modified) (8 diffs)
• UnitStat.pas (modified) (1 diff)

trunk/LocalPlayer/CityScreen.pas

@@ -231 +231 @@
   Template := TBitmap.Create;
   Template.PixelFormat := TPixelFormat.pf24bit;
-  LoadGraphicFile(Template, GetGraphicsDir + DirectorySeparator + 'City.png',
+  LoadGraphicFile(Template, GetGraphicsDir + DirectorySeparator + 'City' + PngExt,
     [gfNoGamma]);
   CityMapTemplate := TBitmap.Create;
   CityMapTemplate.PixelFormat := TPixelFormat.pf24bit;
-  LoadGraphicFile(CityMapTemplate, GetGraphicsDir + DirectorySeparator + 'BigCityMap.png',
+  LoadGraphicFile(CityMapTemplate, GetGraphicsDir + DirectorySeparator + 'BigCityMap' + PngExt,
     [gfNoGamma]);
   SmallCityMapTemplate := TBitmap.Create;
   SmallCityMapTemplate.PixelFormat := TPixelFormat.pf24bit;
-  LoadGraphicFile(SmallCityMapTemplate, GetGraphicsDir + DirectorySeparator + 'SmallCityMap.png',
+  LoadGraphicFile(SmallCityMapTemplate, GetGraphicsDir + DirectorySeparator + 'SmallCityMap' + PngExt,
     [gfNoGamma]);
   SmallCityMap := TBitmap.Create;

trunk/LocalPlayer/Draft.pas

@@ -95 +95 @@
   Template := TBitmap.Create;
   Template.PixelFormat := TPixelFormat.pf24bit;
-  LoadGraphicFile(Template, GetGraphicsDir + DirectorySeparator + 'MiliRes.png',
+  LoadGraphicFile(Template, GetGraphicsDir + DirectorySeparator + 'MiliRes' + PngExt,
     [gfNoGamma]);
 end;

trunk/LocalPlayer/Help.pas

@@ -1071 +1071 @@
           until (P > Length(S)) or (S[P] = '\');
           if LoadGraphicFile(ExtPic, LocalizedFilePath('Help' +
-            DirectorySeparator + Copy(S, 2, P - 2) + '.png')) then
+            DirectorySeparator + Copy(S, 2, P - 2) + PngExt)) then
           begin
             MainText.AddLine('', pkExternal);

trunk/LocalPlayer/IsoEngine.pas

@@ -337 +337 @@
   IsoMapCache[ATileSize] := TIsoMapCache.Create;
 
-  FileName := Format('Terrain%dx%d.png', [xxt * 2, yyt * 2]);
+  FileName := Format('Terrain%dx%d' + PngExt, [xxt * 2, yyt * 2]);
   IsoMapCache[ATileSize].HGrTerrain := LoadGraphicSet(FileName);
   if not Assigned(IsoMapCache[ATileSize].HGrTerrain) then
@@ -343 +343 @@
 
 
-  FileName := Format('Cities%dx%d.png', [xxt * 2, yyt * 2]);
+  FileName := Format('Cities%dx%d' + PngExt, [xxt * 2, yyt * 2]);
   IsoMapCache[ATileSize].HGrCities := LoadGraphicSet(FileName);
   if not Assigned(IsoMapCache[ATileSize].HGrCities) then

trunk/LocalPlayer/NatStat.pas

@@ -93 +93 @@
   Template := TBitmap.Create;
   Template.PixelFormat := TPixelFormat.pf24bit;
-  LoadGraphicFile(Template, GetGraphicsDir + DirectorySeparator + 'Nation.png',
+  LoadGraphicFile(Template, GetGraphicsDir + DirectorySeparator + 'Nation' + PngExt,
     [gfNoGamma]);
 end;

trunk/LocalPlayer/TechTree.pas

@@ -178 +178 @@
     Image := TBitmap.Create;
     Image.PixelFormat := TPixelFormat.pf24bit;
-    LoadGraphicFile(Image, GetAppSharePath('Help' + DirectorySeparator + 'AdvTree.png'),
+    LoadGraphicFile(Image, GetAppSharePath('Help' + DirectorySeparator + 'AdvTree' + PngExt),
       [gfNoGamma]);
 

trunk/LocalPlayer/Term.pas

@@ -803 +803 @@
       Picture.pix := pixNoSlaves;
     Picture.Hash := 0;
-    Picture.GrName := 'StdUnits.png';
+    Picture.GrName := 'StdUnits';
     IsNew := True;
   end
@@ -823 +823 @@
     with Tribe[P].ModelPicture[mix] do
     begin
-      HGr := LoadGraphicSet(Picture.GrName);
+      HGr := LoadGraphicSet(Picture.GrName + PngExt);
       pix := Picture.pix;
     end;
@@ -1407 +1407 @@
     if AILogo[P] = nil then
       AILogo[P] := TBitmap.Create;
-    if not LoadGraphicFile(AILogo[P], GetAppSharePath(Name + '.png'), [gfNoError]) then
+    if not LoadGraphicFile(AILogo[P], GetAppSharePath(Name + PngExt), [gfNoError]) then
     begin
       FreeAndNil(AILogo[P]);
@@ -1766 +1766 @@
   MainMap.SetOutput(Offscreen);
 
-  HGrStdUnits := LoadGraphicSet('StdUnits.png');
+  HGrStdUnits := LoadGraphicSet('StdUnits' + PngExt);
   SmallImp := TBitmap.Create;
   SmallImp.PixelFormat := TPixelFormat.pf24bit;
@@ -1919 +1919 @@
             pix := pixNoSlaves;
           Hash := 0;
-          GrName := 'StdUnits.png';
+          GrName := 'StdUnits';
           Tribe[p1].SetModelPicture(Picture, True);
         end;

trunk/LocalPlayer/Tribes.pas

@@ -322 +322 @@
       Item := Get;
       sympix := GetNum;
-      symHGr := LoadGraphicSet(Item + '.png');
+      symHGr := LoadGraphicSet(Item + PngExt);
     end;
   end;
@@ -442 +442 @@
             end;
           end;
-        cHGr := LoadGraphicSet(Item + '.png');
+        cHGr := LoadGraphicSet(Item + PngExt);
         for X := 0 to 3 do
           with CityPicture[X] do begin
@@ -461 +461 @@
       else
       begin
-        faceHGr := LoadGraphicSet(Item + '.png');
+        faceHGr := LoadGraphicSet(Item + PngExt);
         facepix := GetNum;
         if faceHGr.Data.Canvas.Pixels[facepix mod 10 * 65,
@@ -493 +493 @@
         Dec(I);
       Assert(I >= 0);
-      Assert(PictureList[I].HGr = LoadGraphicSet(GrName));
+      Assert(PictureList[I].HGr = LoadGraphicSet(GrName + PngExt));
       Assert(PictureList[I].pix = pix);
       ModelPicture[mix].HGr := PictureList[I].HGr;
@@ -503 +503 @@
       with ModelPicture[mix] do
       begin
-        HGr := LoadGraphicSet(GrName);
+        HGr := LoadGraphicSet(GrName + PngExt);
         pix := Info.pix;
         Inc(HGr.PixUsed[pix]);
@@ -514 +514 @@
       begin
         Input := Script[I];
-        if Input = '#UNITS ' + ExtractFileNameOnly(GrName) then
+        if Input = '#UNITS ' + ExtractFileNameOnly(GrName + PngExt) then
           Ok := True
         else if (Input <> '') and (Input[1] = '#') then
@@ -610 +610 @@
   LeastUsed := MaxInt;
 
-  TestPic.GrName := 'StdUnits.png';
+  TestPic.GrName := 'StdUnits';
   HGr := HGrStdUnits;
   for I := 0 to StdUnitScript.Count - 1 do
@@ -625 +625 @@
     begin
       Ok := True;
-      TestPic.GrName := Copy(Input, 8, 255) + '.png';
-      HGr := GrExt.SearchByName(TestPic.GrName);
+      TestPic.GrName := Copy(Input, 8, 255);
+      HGr := GrExt.SearchByName(TestPic.GrName + PngExt);
     end
     else if (Input <> '') and (Input[1] = '#') then

trunk/LocalPlayer/UnitStat.pas

@@ -86 +86 @@
   Template := TBitmap.Create;
   Template.PixelFormat := TPixelFormat.pf24bit;
-  LoadGraphicFile(Template, GetGraphicsDir + DirectorySeparator + 'Unit.png',
+  LoadGraphicFile(Template, GetGraphicsDir + DirectorySeparator + 'Unit' + PngExt,
     [gfNoGamma]);
 end;