Changeset 88 for trunk

Timestamp:

Jan 18, 2017, 4:22:26 PM (8 years ago)

Author:

chronos

Message:

• Fixed: Wrong repeated image path composition for StdUnits.png file.

Location:

trunk

Files:

• LocalPlayer/Term.pas (modified) (3 diffs)
• LocalPlayer/Tribes.pas (modified) (4 diffs)
• ScreenTools.pas (modified) (4 diffs)

trunk/LocalPlayer/Term.pas

@@ -653 +653 @@
       Picture.pix := pixNoSlaves;
     Picture.Hash := 0;
-    Picture.GrName := 'StdUnits';
+    Picture.GrName := 'StdUnits.png';
     IsNew := true;
   end
@@ -673 +673 @@
     with Tribe[p].ModelPicture[mix] do
     begin
-      HGr := LoadGraphicSet(Picture.GrName + '.png');
+      HGr := LoadGraphicSet(Picture.GrName);
       pix := Picture.pix;
     end;
@@ -1709 +1709 @@
               pix := pixNoSlaves;
             Hash := 0;
-            GrName := 'StdUnits';
+            GrName := 'StdUnits.png';
             Tribe[p1].SetModelPicture(Picture, true);
           end

trunk/LocalPlayer/Tribes.pas

@@ -477 +477 @@
             dec(i);
           assert(i >= 0);
-          assert(PictureList[i].HGr = LoadGraphicSet(GrName + '.png'));
+          assert(PictureList[i].HGr = LoadGraphicSet(GrName));
           assert(PictureList[i].pix = pix);
           ModelPicture[mix].HGr := PictureList[i].HGr;
@@ -487 +487 @@
           with ModelPicture[mix] do
           begin
-            HGr := LoadGraphicSet(GrName + '.png');
+            HGr := LoadGraphicSet(GrName);
             pix := Info.pix;
             inc(GrExt[HGr].pixUsed[pix]);
@@ -596 +596 @@
       LeastUsed := MaxInt;
 
-      TestPic.GrName := 'StdUnits';
+      TestPic.GrName := 'StdUnits.png';
       HGr := HGrStdUnits;
       for i := 0 to StdUnitScript.Count - 1 do
@@ -611 +611 @@
         begin
           ok := true;
-          TestPic.GrName := Copy(Input, 8, 255);
+          TestPic.GrName := Copy(Input, 8, 255) + '.png';
           HGr := nGrExt - 1;
           while (HGr >= 0) and (GrExt[HGr].Name <> TestPic.GrName) do

trunk/ScreenTools.pas

@@ -59 +59 @@
 procedure EditFrame(ca: TCanvas; p: TRect; const T: TTexture);
 function HexStringToColor(s: string): integer;
-function LoadGraphicFile(bmp: TBitmap; Path: string;
+function LoadGraphicFile(bmp: TBitmap; const Path: string;
   Options: integer = 0): boolean;
-function LoadGraphicSet(Name: string): integer;
+function LoadGraphicSet(const Name: string): integer;
 procedure Dump(dst: TBitmap; HGr, xDst, yDst, Width, Height, xGr, yGr: integer);
 procedure Sprite(Canvas: TCanvas; HGr, xDst, yDst, Width, Height, xGr,
@@ -451 +451 @@
 end;
 
-function LoadGraphicFile(bmp: TBitmap; Path: string; Options: integer): boolean;
+function LoadGraphicFile(bmp: TBitmap; const Path: string; Options: integer): boolean;
 var
   jtex: tjpegimage;
@@ -505 +505 @@
   if not Result then begin
     if Options and gfNoError = 0 then
-      Application.MessageBox(PChar(Format(Phrases.Lookup('FILENOTFOUND'),
-        [Path])), 'C-evo', 0);
-    Exit;
+      raise Exception.Create(Format(Phrases.Lookup('FILENOTFOUND'),
+        [Path]));
   end;
 
@@ -514 +513 @@
 end;
 
-function LoadGraphicSet(Name: string): integer;
-var
-  i, x, y, xmax, OriginalColor: integer;
+function LoadGraphicSet(const Name: string): integer;
+var
+  I, x, y, xmax, OriginalColor: integer;
   FileName: string;
   Source: TBitmap;
   DataPixel, MaskPixel: TPixelPointer;
 begin
-  i := 0;
-  while (i < nGrExt) and (GrExt[i].Name <> Name) do
-    inc(i);
-  result := i;
-  if i = nGrExt then begin
+  I := 0;
+  while (I < nGrExt) and (GrExt[i].Name <> Name) do
+    Inc(I);
+  Result := I;
+  if I = nGrExt then begin
     Source := TBitmap.Create;
     Source.PixelFormat := pf24bit;