stjr/UltimateZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/UltimateZoneBuilder.git synced 2025-05-31 00:51:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

More fixes to PK3/Directory patch and texture search logic.

Browse source 
Fixed, Textures Browser form: fixed another case of the blank textures list after opening the form.
This commit is contained in:
MaxED 2014-10-07 08:56:21 +00:00
parent 88e5e790e7
commit 7c048ece38
5 changed files with 90 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Source/Core/Data/PK3StructuredReader.cs
View file

@ -54,8 +54,8 @@ namespace CodeImp.DoomBuilder.Data
#region ================== Properties
protected readonly string[] PatchLocations = { PATCHES_DIR, TEXTURES_DIR, FLATS_DIR, SPRITES_DIR, GRAPHICS_DIR }; //mxd. Because ZDoom looks for patches and sprites in this order
protected readonly string[] TextureLocations = { TEXTURES_DIR, PATCHES_DIR, FLATS_DIR, SPRITES_DIR, GRAPHICS_DIR }; //mxd. Because ZDoom looks for textures in this order
protected readonly string[] PatchLocations = { TEXTURES_DIR, PATCHES_DIR, FLATS_DIR, SPRITES_DIR, GRAPHICS_DIR }; //mxd. Because ZDoom looks for patches and sprites in this order
protected readonly string[] TextureLocations = { TEXTURES_DIR, FLATS_DIR, SPRITES_DIR, PATCHES_DIR, GRAPHICS_DIR }; //mxd. Because ZDoom looks for textures in this order
#endregion
@ -268,10 +268,21 @@ namespace CodeImp.DoomBuilder.Data
// Error when suspended
if (issuspended) throw new Exception("Data reader is suspended");
// Find in directories ZDoom expects them to be
foreach (string loc in PatchLocations)
if (General.Map.Config.MixTexturesFlats)
{
string path = Path.Combine(loc, Path.GetDirectoryName(pname));
// Find in directories ZDoom expects them to be
foreach (string loc in PatchLocations)
{
string path = Path.Combine(loc, Path.GetDirectoryName(pname));
string filename = FindFirstFile(path, Path.GetFileName(pname), true);
if (!string.IsNullOrEmpty(filename) && FileExists(filename))
return filename;
}
}
else
{
// Find in patches directory
string path = Path.Combine(PATCHES_DIR, Path.GetDirectoryName(pname));
string filename = FindFirstFile(path, Path.GetFileName(pname), true);
if (!string.IsNullOrEmpty(filename) && FileExists(filename))
return filename;