stjr/UltimateZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/UltimateZoneBuilder.git synced 2025-01-31 12:50:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fatal crash (Texture name input) #367

Browse source
This commit is contained in:
Magnus Norddahl 2020-01-13 19:11:10 +01:00
parent a2b18f1893
commit 7ea64f910b
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Source/Core/Data/DataManager.cs
View file

@ -230,7 +230,7 @@ namespace CodeImp.DoomBuilder.Data
// Load special images (mxd: the rest is loaded in LoadInternalTextures()) // Load special images (mxd: the rest is loaded in LoadInternalTextures())
whitetexture = new ResourceImage("CodeImp.DoomBuilder.Resources.White.png") { UseColorCorrection = false }; whitetexture = new ResourceImage("CodeImp.DoomBuilder.Resources.White.png") { UseColorCorrection = false };
blacktexture = new ResourceImage("CodeImp.DoomBuilder.Resources.Black.png") { UseColorCorrection = false }; //mxd blacktexture = new ResourceImage("CodeImp.DoomBuilder.Resources.Black.png") { UseColorCorrection = false }; //mxd
unknownimage = new UnknownImage(Properties.Resources.UnknownImage); //mxd. There should be only one! unknownimage = new UnknownImage(); //mxd. There should be only one!
//mxd. Textures browser images //mxd. Textures browser images
foldertexture = new ResourceImage("CodeImp.DoomBuilder.Resources.Folder96.png") { UseColorCorrection = false }; foldertexture = new ResourceImage("CodeImp.DoomBuilder.Resources.Folder96.png") { UseColorCorrection = false };

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

@ -34,12 +34,12 @@ namespace CodeImp.DoomBuilder.Data
#region ================== Constructor / Disposer #region ================== Constructor / Disposer
// Constructor // Constructor
public UnknownImage(Bitmap image) public UnknownImage()
{ {
// Initialize // Initialize
this.width = 0; this.width = 0;
this.height = 0; this.height = 0;
this.loadbitmap = image; this.loadbitmap = Properties.Resources.UnknownImage;
SetName(""); SetName("");
LoadImageNow(); LoadImageNow();
@ -52,7 +52,7 @@ namespace CodeImp.DoomBuilder.Data
// This 'loads' the image // This 'loads' the image
protected override LocalLoadResult LocalLoadImage() protected override LocalLoadResult LocalLoadImage()
{ {
return new LocalLoadResult(loadbitmap); return new LocalLoadResult(new Bitmap(loadbitmap));
} }
// This returns a preview image // This returns a preview image

2
Source/Core/Editing/GridSetup.cs
View file

@ -55,7 +55,7 @@ namespace CodeImp.DoomBuilder.Editing
// Background // Background
private string background = ""; private string background = "";
private int backsource; private int backsource;
private ImageData backimage = new UnknownImage(null); private ImageData backimage = new UnknownImage();
private int backoffsetx, backoffsety; private int backoffsetx, backoffsety;
private float backscalex, backscaley; private float backscalex, backscaley;