stjr/UltimateZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/UltimateZoneBuilder.git synced 2025-05-31 09:01:22 +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

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

@ -53,7 +53,8 @@ namespace CodeImp.DoomBuilder.Data
lock(this)
{
// Get the lump data stream
Stream lumpdata = General.Map.Data.GetFlatData(Name, hasLongName);
string flatlocation = string.Empty; //mxd
Stream lumpdata = General.Map.Data.GetFlatData(Name, hasLongName, ref flatlocation);
if(lumpdata != null)
{
// Copy lump data to memory
@ -68,7 +69,7 @@ namespace CodeImp.DoomBuilder.Data
if(reader is UnknownImageReader)
{
// Data is in an unknown format!
General.ErrorLogger.Add(ErrorType.Error, "Flat lump \"" + Name + "\" data format could not be read. Does this lump contain valid picture data at all?");
General.ErrorLogger.Add(ErrorType.Error, "Flat lump \"" + Path.Combine(flatlocation, Name) + "\" data format could not be read. Does this lump contain valid picture data at all?");
bitmap = null;
}
else