mirror of
https://git.do.srb2.org/STJr/UltimateZoneBuilder.git
synced 2024-11-26 22:01:45 +00:00
More fixes to PK3/Directory patch and texture search/creation logic.
This commit is contained in:
parent
7c048ece38
commit
d8df65b2c1
2 changed files with 21 additions and 9 deletions
|
@ -72,15 +72,15 @@ namespace CodeImp.DoomBuilder.Data
|
|||
// This loads the image
|
||||
protected override void LocalLoadImage()
|
||||
{
|
||||
// Checks
|
||||
if(this.IsImageLoaded) return;
|
||||
if((width == 0) || (height == 0)) return;
|
||||
|
||||
IImageReader reader;
|
||||
MemoryStream mem;
|
||||
byte[] membytes;
|
||||
Graphics g = null;
|
||||
|
||||
// Checks
|
||||
if(this.IsImageLoaded) return;
|
||||
if((width == 0) || (height == 0)) return;
|
||||
|
||||
lock(this)
|
||||
{
|
||||
// Create texture bitmap
|
||||
|
|
|
@ -54,7 +54,7 @@ namespace CodeImp.DoomBuilder.Data
|
|||
|
||||
#region ================== Properties
|
||||
|
||||
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[] 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, FLATS_DIR, SPRITES_DIR, PATCHES_DIR, GRAPHICS_DIR }; //mxd. Because ZDoom looks for textures in this order
|
||||
|
||||
#endregion
|
||||
|
@ -319,10 +319,22 @@ namespace CodeImp.DoomBuilder.Data
|
|||
collection = LoadDirectoryImages("", ImageDataFormat.DOOMFLAT, false);
|
||||
AddImagesToList(images, collection);
|
||||
}
|
||||
|
||||
// Add images from flats directory
|
||||
collection = LoadDirectoryImages(FLATS_DIR, ImageDataFormat.DOOMFLAT, true);
|
||||
AddImagesToList(images, collection);
|
||||
|
||||
if (General.Map.Config.MixTexturesFlats)
|
||||
{
|
||||
//mxd. Load from directories ZDoom expects them to be
|
||||
foreach(string loc in TextureLocations)
|
||||
{
|
||||
collection = LoadDirectoryImages(loc, ImageDataFormat.DOOMFLAT, true);
|
||||
AddImagesToList(images, collection);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
// Add images from flats directory
|
||||
collection = LoadDirectoryImages(FLATS_DIR, ImageDataFormat.DOOMFLAT, true);
|
||||
AddImagesToList(images, collection);
|
||||
}
|
||||
|
||||
// Load TEXTURES lump file
|
||||
string[] alltexturefiles = GetAllFilesWhichTitleStartsWith("", "TEXTURES"); //mxd
|
||||
|
|
Loading…
Reference in a new issue