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

Fixed source window freezing while Open Map window was open when opening a wad by dragging & dropping it on the editor's main window.

Browse source 
Image loading-related warnings and errors now display more information about the image resource.
This commit is contained in:
MaxED 2016-03-14 21:53:53 +00:00
parent 8924f62d7d
commit 4aefe78975
18 changed files with 232 additions and 106 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -78,7 +78,7 @@ namespace CodeImp.DoomBuilder.Data
foreach(string w in wadfiles)
{
string tempfile = CreateTempFile(w);
DataLocation wdl = new DataLocation(DataLocation.RESOURCE_WAD, tempfile, false, false, true);
DataLocation wdl = new DataLocation(DataLocation.RESOURCE_WAD, tempfile, Path.Combine(location.GetDisplayName(), Path.GetFileName(w)), false, false, true);
wads.Add(new WADReader(wdl));
}
}
@ -354,7 +354,7 @@ namespace CodeImp.DoomBuilder.Data
}
//mxd.
public override Stream GetFlatData(string pname, bool longname)
public override Stream GetFlatData(string pname, bool longname, ref string flatlocation)
{
// Error when suspended
if(issuspended) throw new Exception("Data reader is suspended");
@ -365,7 +365,7 @@ namespace CodeImp.DoomBuilder.Data
{
for(int i = wads.Count - 1; i > -1; i--)
{
Stream data = wads[i].GetFlatData(pname, false);
Stream data = wads[i].GetFlatData(pname, false, ref flatlocation);
if(data != null) return data;
}
}