X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fshared%2Fwadreader.pas;h=09bb5033dcda43c19fac864f90e13649f4d23a6c;hb=345e116f73d0e4b11593a94bee7d18b9e64572eb;hp=b83102bf611814015126b787f8cc968608541120;hpb=d7d166dc3cd287276202e862746208892c4cc89f;p=d2df-sdl.git

diff --git a/src/shared/wadreader.pas b/src/shared/wadreader.pas
index b83102b..09bb503 100644
--- a/src/shared/wadreader.pas
+++ b/src/shared/wadreader.pas
@@ -22,13 +22,13 @@ unit wadreader;
 interface
 
 uses
-  mempool, sfs, xstreams, Classes;
+  Classes,
+  {$IFDEF USE_MEMPOOL}mempool,{$ENDIF}
+  sfs, xstreams, utils;
 
 
 type
-  SArray = array of ShortString;
-
-  TWADFile = class(TPoolObject)
+  TWADFile = class{$IFDEF USE_MEMPOOL}(TPoolObject){$ENDIF}
   private
     fFileName: AnsiString; // empty: not opened
     fIter: TSFSFileList;
@@ -49,7 +49,7 @@ type
 
     function GetResource (name: AnsiString; var pData: Pointer; var Len: Integer; logError: Boolean=true): Boolean;
     function GetMapResource (name: AnsiString; var pData: Pointer; var Len: Integer; logError: Boolean=true): Boolean;
-    function GetMapResources (): SArray;
+    function GetMapResources (): SSArray;
 
     // returns `nil` if file wasn't found
     function openFileStream (name: AnsiString): TStream;
@@ -76,7 +76,7 @@ var
 implementation
 
 uses
-  SysUtils, e_log, utils, MAPDEF, xdynrec;
+  SysUtils, e_log, MAPDEF, xdynrec;
 
 
 function findDiskWad (fname: AnsiString): AnsiString;
@@ -459,7 +459,7 @@ begin
   result := GetResourceEx(name, true, pData, Len, logError);
 end;
 
-function TWADFile.GetMapResources (): SArray;
+function TWADFile.GetMapResources (): SSArray;
 var
   f, c: Integer;
   fi: TSFSFileInfo;