stjr/UltimateZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/UltimateZoneBuilder.git synced 2025-02-17 01:22:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed, Directory/PK3/PK7 image loading: we should use DoomTexture as expected format when loading flats from non-"Flats" folders.

Browse source
This commit is contained in:
MaxED 2014-10-12 22:22:36 +00:00
parent 10da128475
commit 0cfb0207fb
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -56,6 +56,7 @@ namespace CodeImp.DoomBuilder.Data
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
protected readonly int[] TextureFormats = { ImageDataFormat.DOOMPICTURE, ImageDataFormat.DOOMFLAT, ImageDataFormat.DOOMPICTURE, ImageDataFormat.DOOMPICTURE, ImageDataFormat.DOOMPICTURE }; //mxd
#endregion
@ -323,9 +324,9 @@ namespace CodeImp.DoomBuilder.Data
if (General.Map.Config.MixTexturesFlats)
{
//mxd. Load from directories ZDoom expects them to be
foreach(string loc in TextureLocations)
for(int i = 0; i < TextureLocations.Length; i++)
{
collection = LoadDirectoryImages(loc, ImageDataFormat.DOOMFLAT, true);
collection = LoadDirectoryImages(TextureLocations[i], TextureFormats[i], true);
AddImagesToList(images, collection);
}
}