unused variable commente, eol corrected and property set

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1117 b956fd51-792f-4845-bead-9b4dfca2ff2c

1 files changed, 64 insertions, 64 deletions

diff --git a/Game/Code/Classes/UImage.pas b/Game/Code/Classes/UImage.pas
index d0a9d0d8..bc23bbf5 100644
--- a/Game/Code/Classes/UImage.pas
+++ b/Game/Code/Classes/UImage.pas
@@ -273,15 +273,15 @@ end;
  *)

 function WritePNGImage(const FileName: string; Surface: PSDL_Surface): boolean;

 var

-  png_ptr: png_structp;

-  info_ptr: png_infop;

-  pngFile: TFileStream;

-  row: integer;

-  rowData: array of png_bytep;

-  rowStride: integer;

+  png_ptr:   png_structp;

+  info_ptr:  png_infop;

+  pngFile:   TFileStream;

+  row:       integer;

+  rowData:   array of png_bytep;

+//  rowStride: integer;

   converted: boolean;

   colorType: integer;

-  //time: png_time;

+//  time:      png_time;

 begin

   Result := false;

 

@@ -708,62 +708,62 @@ end;
  * Loads an image from the given file or resource

  *)

 function LoadImage(const Identifier: string): PSDL_Surface;

-var
-  TexRWops:  PSDL_RWops;
-  TexStream: TStream;
-  FileName: string;
-begin
-  Result   := nil;
-  TexRWops := nil;
-
-  if Identifier = '' then
-    exit;
-    
-  //Log.LogStatus( Identifier, 'LoadImage' );
-
-  FileName := Identifier;
-
-  if (FileExistsInsensitive(FileName)) then
-  begin
-    // load from file
-    //Log.LogStatus( 'Is File ( Loading : '+FileName+')', '  LoadImage' );
-    try
-      Result := IMG_Load(PChar(FileName));
-      //Log.LogStatus( '       '+inttostr( integer( Result ) ), '  LoadImage' );
-    except
-      Log.LogError('Could not load from file "'+FileName+'"', 'TTextureUnit.LoadImage');
-      Exit;
-    end;
-  end
-  else
-  begin
-    //Log.LogStatus( 'IS Resource, because file does not exist.('+Identifier+')', '  LoadImage' );
-
-    TexStream := GetResourceStream(Identifier, 'TEX');
-    if (not assigned(TexStream)) then
-    begin
-      Log.LogError( 'Invalid file or resource "'+ Identifier+'"', 'TTextureUnit.LoadImage');
-      Exit;
-    end;
-
-    TexRWops := RWopsFromStream(TexStream);
-    if (TexRWops = nil) then
-    begin
-      Log.LogError( 'Could not assign resource "'+Identifier+'"', 'TTextureUnit.LoadImage');
-      TexStream.Free();
-      Exit;
-    end;
-
-    //Log.LogStatus( 'resource Assigned....' , Identifier);
-    try
-      Result := IMG_Load_RW(TexRWops, 0);
-    except
-      Log.LogError( 'Could not read resource "'+Identifier+'"', 'TTextureUnit.LoadImage');
-    end;
-
-    SDL_FreeRW(TexRWops);
-    TexStream.Free();
-  end;
-end;
+var

+  TexRWops:  PSDL_RWops;

+  TexStream: TStream;

+  FileName: string;

+begin

+  Result   := nil;

+  TexRWops := nil;

+

+  if Identifier = '' then

+    exit;

+    

+  //Log.LogStatus( Identifier, 'LoadImage' );

+

+  FileName := Identifier;

+

+  if (FileExistsInsensitive(FileName)) then

+  begin

+    // load from file

+    //Log.LogStatus( 'Is File ( Loading : '+FileName+')', '  LoadImage' );

+    try

+      Result := IMG_Load(PChar(FileName));

+      //Log.LogStatus( '       '+inttostr( integer( Result ) ), '  LoadImage' );

+    except

+      Log.LogError('Could not load from file "'+FileName+'"', 'TTextureUnit.LoadImage');

+      Exit;

+    end;

+  end

+  else

+  begin

+    //Log.LogStatus( 'IS Resource, because file does not exist.('+Identifier+')', '  LoadImage' );

+

+    TexStream := GetResourceStream(Identifier, 'TEX');

+    if (not assigned(TexStream)) then

+    begin

+      Log.LogError( 'Invalid file or resource "'+ Identifier+'"', 'TTextureUnit.LoadImage');

+      Exit;

+    end;

+

+    TexRWops := RWopsFromStream(TexStream);

+    if (TexRWops = nil) then

+    begin

+      Log.LogError( 'Could not assign resource "'+Identifier+'"', 'TTextureUnit.LoadImage');

+      TexStream.Free();

+      Exit;

+    end;

+

+    //Log.LogStatus( 'resource Assigned....' , Identifier);

+    try

+      Result := IMG_Load_RW(TexRWops, 0);

+    except

+      Log.LogError( 'Could not read resource "'+Identifier+'"', 'TTextureUnit.LoadImage');

+    end;

+

+    SDL_FreeRW(TexRWops);

+    TexStream.Free();

+  end;

+end;

 

 end.