X-Git-Url: http://deadsoftware.ru/gitweb?p=d2df-editor.git;a=blobdiff_plain;f=src%2Feditor%2Fg_resources.pas;h=efed1250499e8047dadb1a04f18988219a47be32;hp=89b242a5958dd719999dc26328a5cba00dd06d2d;hb=01c9a29799525526658398f627b8be9f8f11e903;hpb=fb34967a723d0b8fb14bf0ef0522b5635ae5d8d2 diff --git a/src/editor/g_resources.pas b/src/editor/g_resources.pas index 89b242a..efed125 100644 --- a/src/editor/g_resources.pas +++ b/src/editor/g_resources.pas @@ -7,7 +7,7 @@ interface implementation - uses sfs, xstreams, utils, Classes; + uses sfs, utils, Classes; procedure g_ReadResource (wad, section, name: String; out data: PByte; out len: Integer); var @@ -33,14 +33,14 @@ implementation stream.Destroy end end; + SFSGCCollect end; procedure g_ReadSubResource (wad, section0, name0, section1, name1: String; out data: PByte; out len: Integer); var stream0, stream1: TStream; str0, str1: String; - xdata: Pointer; - i, xlen: Integer; + i: Integer; begin data := nil; len := 0; @@ -58,7 +58,7 @@ implementation if SFSAddSubDataFile(wad + '\' + str0, stream0, TRUE) then begin str1 := SFSGetLastVirtualName(section1 + '\' + name1); - stream1 := SFSFileOpenEx(wad + '\' + str0 + '::' + str1); + stream1 := SFSFileOpen(wad + '\' + str0 + '::' + str1); if stream1 <> nil then begin len := stream1.Size; @@ -74,7 +74,8 @@ implementation begin stream0.Destroy end - end + end; + SFSGCCollect end; end.