diff --git a/XEditLib.dproj b/XEditLib.dproj index caddc2a..875fa16 100644 --- a/XEditLib.dproj +++ b/XEditLib.dproj @@ -91,10 +91,10 @@ 0 - CompanyName=;FileDescription=;FileVersion=0.5.1.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=0.5;Comments= + CompanyName=;FileDescription=;FileVersion=0.5.2.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=0.5;Comments= false 5 - 1 + 2 DetailedSegments diff --git a/XEditLib.res b/XEditLib.res index 7df0890..47a243a 100644 Binary files a/XEditLib.res and b/XEditLib.res differ diff --git a/XEditLibTests.dpr b/XEditLibTests.dpr index 7369100..2f6b2bb 100644 --- a/XEditLibTests.dpr +++ b/XEditLibTests.dpr @@ -14,6 +14,8 @@ uses xeMeta in 'src\xeMeta.pas', xeSetup in 'src\xeSetup.pas', xeFiles in 'src\xeFiles.pas', + xeArchives in 'src\xeArchives.pas', + xeTextures in 'src\xeTextures.pas', xeMasters in 'src\xeMasters.pas', xeElements in 'src\xeElements.pas', xeElementValues in 'src\xeElementValues.pas', @@ -39,6 +41,8 @@ uses txMessages in 'tests\txMessages.pas', txSetup in 'tests\txSetup.pas', txFiles in 'tests\txFiles.pas', + txTextures in 'tests\txTextures.pas', + txArchives in 'tests\txArchives.pas', txMasters in 'tests\txMasters.pas', txElements in 'tests\txElements.pas', txElementValues in 'tests\txElementValues.pas', @@ -63,6 +67,8 @@ begin BuildMetaTests; BuildMessageTests; BuildFileHandlingTests; + BuildTextureTests; + BuildArchiveTests; BuildMasterHandlingTests; BuildElementHandlingTests; BuildElementValueTests; diff --git a/XEditLibTests.dproj b/XEditLibTests.dproj index 0a2f5e9..0d2f92b 100644 --- a/XEditLibTests.dproj +++ b/XEditLibTests.dproj @@ -184,6 +184,7 @@ SKYRIM;SKIP_BENCHMARKS;$(DCC_Define) CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments= (None) + DetailedSegments false @@ -218,6 +219,8 @@ + + @@ -242,6 +245,8 @@ + + diff --git a/src/xeArchives.pas b/src/xeArchives.pas index 42def91..8e87f24 100644 --- a/src/xeArchives.pas +++ b/src/xeArchives.pas @@ -21,16 +21,6 @@ implementation SysUtils, xeMessages, xeMeta; -procedure FilterStringList(var sl: TStringList; filter: String); -var - i: Integer; -begin - if filter = '' then exit; - for i := Pred(sl.Count) downto 0 do - if not sl[i].StartsWith(filter, true) then - sl.Delete(i); -end; - function ExtractContainer(name, destination: PWideChar; replace: WordBool): WordBool; cdecl; var ResourceList: TStringList; @@ -78,8 +68,7 @@ function GetContainerFiles(name, path: PWideChar; len: PInteger): WordBool; cdec raise Exception.Create(name + ' not loaded.'); ResourceList := TStringList.Create; try - wbContainerHandler.ContainerResourceList(name, ResourceList); - FilterStringList(ResourceList, path); + wbContainerHandler.ContainerResourceList(name, ResourceList, path); SetResultFromList(ResourceList, len); finally ResourceList.Free;