Changeset 88 for trunk/ScreenTools.pas

Timestamp:

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

Author:

chronos

Message:

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

File:

• trunk/ScreenTools.pas (modified) (4 diffs)

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;