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

Moving to new SVN...

Browse source
This commit is contained in:
MaxED 2013-03-18 13:52:27 +00:00
parent ad46513126
commit 591f92cce6
372 changed files with 22271 additions and 7219 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -175,7 +175,8 @@ namespace CodeImp.DoomBuilder.Data
// Load from wad files (NOTE: backward order, because the last wad's images have priority)
for(int i = wads.Count - 1; i >= 0; i--)
{
collection = wads[i].LoadTextures(pnames);
PatchNames wadpnames = wads[i].LoadPatchNames(); //mxd
collection = wads[i].LoadTextures((wadpnames != null && wadpnames.Length > 0) ? wadpnames : pnames); //mxd
AddImagesToList(images, collection);
}
@ -186,11 +187,6 @@ namespace CodeImp.DoomBuilder.Data
AddImagesToList(images, collection);
}
//mxd
// Add images from texture directory
//collection = LoadDirectoryImages(TEXTURES_DIR, ImageDataFormat.DOOMPICTURE, true);
//AddImagesToList(images, collection);
// Load TEXTURE1 lump file
imgset.Clear();
string texture1file = FindFirstFile("TEXTURE1", false);