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

Removed some unneeded punctuation in error/warning messages and hidden the "conversion was needed" warning.

Browse source
This commit is contained in:
codeimp 2009-03-01 09:15:58 +00:00
parent a5ffba5215
commit e524e933a4
23 changed files with 60 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Source/Actions/ActionManager.cs
View file

@ -137,7 +137,7 @@ namespace CodeImp.DoomBuilder.Actions
{ {
string errordesc = "Error in Actions configuration on line " + cfg.ErrorLine + ": " + cfg.ErrorDescription; string errordesc = "Error in Actions configuration on line " + cfg.ErrorLine + ": " + cfg.ErrorDescription;
General.CancelAutoMapLoad(); General.CancelAutoMapLoad();
General.ErrorLogger.Add(ErrorType.Error, "Unable to read Actions configuration from assembly " + Path.GetFileName(asm.Location) + "!"); General.ErrorLogger.Add(ErrorType.Error, "Unable to read Actions configuration from assembly " + Path.GetFileName(asm.Location));
General.WriteLogLine(errordesc); General.WriteLogLine(errordesc);
General.ShowErrorMessage("Unable to read Actions configuration from assembly " + Path.GetFileName(asm.Location) + "!\n" + errordesc, MessageBoxButtons.OK); General.ShowErrorMessage("Unable to read Actions configuration from assembly " + Path.GetFileName(asm.Location) + "!\n" + errordesc, MessageBoxButtons.OK);
} }
@ -195,7 +195,7 @@ namespace CodeImp.DoomBuilder.Actions
else else
{ {
// Action already exists! // Action already exists!
General.ErrorLogger.Add(ErrorType.Warning, "Action '" + name + "' already exists. Action names must be unique!"); General.ErrorLogger.Add(ErrorType.Warning, "Action '" + name + "' already exists. Action names must be unique.");
} }
} }
@ -265,7 +265,7 @@ namespace CodeImp.DoomBuilder.Actions
if(Exists(actionname)) if(Exists(actionname))
actions[actionname].BindEnd(del); actions[actionname].BindEnd(del);
else else
throw new ArgumentException("Could not bind " + m.ReflectedType.Name + "." + m.Name + " to action \"" + actionname + "\", that action does not exist! Refer to, or edit Actions.cfg for all available application actions."); throw new ArgumentException("Could not bind " + m.ReflectedType.Name + "." + m.Name + " to action \"" + actionname + "\", that action does not exist. Refer to, or edit Actions.cfg for all available application actions.");
} }
} }
} }
@ -282,7 +282,7 @@ namespace CodeImp.DoomBuilder.Actions
if(Exists(actionname)) if(Exists(actionname))
actions[actionname].BindBegin(d); actions[actionname].BindBegin(d);
else else
General.ErrorLogger.Add(ErrorType.Warning, "Could not bind delegate for " + d.Method.Name + " to action \"" + a.ActionName + "\" (" + actionname + "), that action does not exist! Refer to, or edit Actions.cfg for all available application actions."); General.ErrorLogger.Add(ErrorType.Warning, "Could not bind delegate for " + d.Method.Name + " to action \"" + a.ActionName + "\" (" + actionname + "), that action does not exist. Refer to, or edit Actions.cfg for all available application actions.");
} }
// This binds a delegate manually // This binds a delegate manually
@ -297,7 +297,7 @@ namespace CodeImp.DoomBuilder.Actions
if(Exists(actionname)) if(Exists(actionname))
actions[actionname].BindEnd(d); actions[actionname].BindEnd(d);
else else
General.ErrorLogger.Add(ErrorType.Warning, "Could not bind delegate for " + d.Method.Name + " to action \"" + a.ActionName + "\" (" + actionname + "), that action does not exist! Refer to, or edit Actions.cfg for all available application actions."); General.ErrorLogger.Add(ErrorType.Warning, "Could not bind delegate for " + d.Method.Name + " to action \"" + a.ActionName + "\" (" + actionname + "), that action does not exist. Refer to, or edit Actions.cfg for all available application actions.");
} }
// This unbinds all methods marked with this attribute // This unbinds all methods marked with this attribute

4
Source/BuilderModes/Interface/ErrorCheckForm.cs
View file

@ -266,14 +266,14 @@ namespace CodeImp.DoomBuilder.BuilderModes
catch(TargetInvocationException ex) catch(TargetInvocationException ex)
{ {
// Error! // Error!
General.ErrorLogger.Add(ErrorType.Error, "Failed to create class instance '" + t.Name + "'!"); General.ErrorLogger.Add(ErrorType.Error, "Failed to create class instance '" + t.Name + "'");
General.WriteLogLine(ex.InnerException.GetType().Name + ": " + ex.InnerException.Message); General.WriteLogLine(ex.InnerException.GetType().Name + ": " + ex.InnerException.Message);
throw ex; throw ex;
} }
catch(Exception ex) catch(Exception ex)
{ {
// Error! // Error!
General.ErrorLogger.Add(ErrorType.Error, "Failed to create class instance '" + t.Name + "'!"); General.ErrorLogger.Add(ErrorType.Error, "Failed to create class instance '" + t.Name + "'");
General.WriteLogLine(ex.GetType().Name + ": " + ex.Message); General.WriteLogLine(ex.GetType().Name + ": " + ex.Message);
throw ex; throw ex;
} }

4
Source/BuilderModes/Interface/FindReplaceForm.cs
View file

@ -83,14 +83,14 @@ namespace CodeImp.DoomBuilder.BuilderModes
catch(TargetInvocationException ex) catch(TargetInvocationException ex)
{ {
// Error! // Error!
General.ErrorLogger.Add(ErrorType.Error, "Failed to create class instance '" + t.Name + "'!"); General.ErrorLogger.Add(ErrorType.Error, "Failed to create class instance '" + t.Name + "'");
General.WriteLogLine(ex.InnerException.GetType().Name + ": " + ex.InnerException.Message); General.WriteLogLine(ex.InnerException.GetType().Name + ": " + ex.InnerException.Message);
throw ex; throw ex;
} }
catch(Exception ex) catch(Exception ex)
{ {
// Error! // Error!
General.ErrorLogger.Add(ErrorType.Error, "Failed to create class instance '" + t.Name + "'!"); General.ErrorLogger.Add(ErrorType.Error, "Failed to create class instance '" + t.Name + "'");
General.WriteLogLine(ex.GetType().Name + ": " + ex.Message); General.WriteLogLine(ex.GetType().Name + ": " + ex.Message);
throw ex; throw ex;
} }

2
Source/Compilers/Compiler.cs
View file

@ -114,7 +114,7 @@ namespace CodeImp.DoomBuilder.Compilers
{ {
string sourcefile = Path.Combine(General.CompilersPath, f); string sourcefile = Path.Combine(General.CompilersPath, f);
string targetfile = Path.Combine(tempdir.FullName, f); string targetfile = Path.Combine(tempdir.FullName, f);
if(!File.Exists(sourcefile)) General.ErrorLogger.Add(ErrorType.Error, "The file '" + f + "' required by the '" + info.Name + "' compiler is missing!"); if(!File.Exists(sourcefile)) General.ErrorLogger.Add(ErrorType.Error, "The file '" + f + "' required by the '" + info.Name + "' compiler is missing.");
File.Copy(sourcefile, targetfile, true); File.Copy(sourcefile, targetfile, true);
} }
} }

2
Source/Config/ArgumentInfo.cs
View file

@ -86,7 +86,7 @@ namespace CodeImp.DoomBuilder.Config
} }
else else
{ {
General.ErrorLogger.Add(ErrorType.Warning, "'" + argspath + ".arg" + istr + "' references unknown enumeration '" + argdic["enum"] + "'!"); General.ErrorLogger.Add(ErrorType.Warning, "'" + argspath + ".arg" + istr + "' references unknown enumeration '" + argdic["enum"] + "'");
} }
} }
} }

16
Source/Config/GameConfiguration.cs
View file

@ -370,7 +370,7 @@ namespace CodeImp.DoomBuilder.Config
} }
catch(Exception) catch(Exception)
{ {
General.ErrorLogger.Add(ErrorType.Warning, "Unable to read universal field definition 'universalfields." + elementname + "." + de.Key + "'!"); General.ErrorLogger.Add(ErrorType.Warning, "Unable to read universal field definition 'universalfields." + elementname + "." + de.Key + "'");
} }
} }
@ -400,7 +400,7 @@ namespace CodeImp.DoomBuilder.Config
} }
else else
{ {
General.ErrorLogger.Add(ErrorType.Warning, "Thing number " + t.Index + " is defined more than once! (as '" + things[t.Index].Title + "' and '" + t.Title + "')"); General.ErrorLogger.Add(ErrorType.Warning, "Thing number " + t.Index + " is defined more than once (as '" + things[t.Index].Title + "' and '" + t.Title + "')");
} }
} }
@ -478,7 +478,7 @@ namespace CodeImp.DoomBuilder.Config
else else
{ {
// Failure // Failure
General.ErrorLogger.Add(ErrorType.Warning, "Structure 'linedeftypes' contains invalid types! (all types must be expanded structures)"); General.ErrorLogger.Add(ErrorType.Warning, "Structure 'linedeftypes' contains invalid types (all types must be expanded structures)");
} }
} }
} }
@ -530,7 +530,7 @@ namespace CodeImp.DoomBuilder.Config
} }
else else
{ {
General.ErrorLogger.Add(ErrorType.Warning, "Structure 'gen_linedeftypes' contains invalid entries!"); General.ErrorLogger.Add(ErrorType.Warning, "Structure 'gen_linedeftypes' contains invalid entries");
} }
} }
} }
@ -560,7 +560,7 @@ namespace CodeImp.DoomBuilder.Config
} }
else else
{ {
General.ErrorLogger.Add(ErrorType.Warning, "Structure 'sectortypes' contains invalid keys!"); General.ErrorLogger.Add(ErrorType.Warning, "Structure 'sectortypes' contains invalid keys");
} }
} }
@ -585,7 +585,7 @@ namespace CodeImp.DoomBuilder.Config
} }
else else
{ {
General.ErrorLogger.Add(ErrorType.Warning, "Structure 'gen_sectortypes' contains invalid entries!"); General.ErrorLogger.Add(ErrorType.Warning, "Structure 'gen_sectortypes' contains invalid entries");
} }
} }
} }
@ -625,7 +625,7 @@ namespace CodeImp.DoomBuilder.Config
} }
else else
{ {
General.ErrorLogger.Add(ErrorType.Warning, "Structure 'defaultthingflags' contains unknown thing flags!"); General.ErrorLogger.Add(ErrorType.Warning, "Structure 'defaultthingflags' contains unknown thing flags");
} }
} }
} }
@ -646,7 +646,7 @@ namespace CodeImp.DoomBuilder.Config
} }
else else
{ {
General.ErrorLogger.Add(ErrorType.Warning, "Structure 'skills' contains invalid skill numbers!"); General.ErrorLogger.Add(ErrorType.Warning, "Structure 'skills' contains invalid skill numbers");
} }
} }
} }

2
Source/Config/GeneralizedOption.cs
View file

@ -80,7 +80,7 @@ namespace CodeImp.DoomBuilder.Config
} }
else else
{ {
General.ErrorLogger.Add(ErrorType.Warning, "Structure '" + fullpath + "." + name + "' contains invalid entries!"); General.ErrorLogger.Add(ErrorType.Warning, "Structure '" + fullpath + "." + name + "' contains invalid entries");
} }
} }

4
Source/Controls/ScriptFileDocumentTab.cs
View file

@ -156,7 +156,7 @@ namespace CodeImp.DoomBuilder.Controls
catch(Exception e) catch(Exception e)
{ {
// Failed // Failed
General.ErrorLogger.Add(ErrorType.Error, "Cannot open file '" + filepathname + "' for writing."); General.ErrorLogger.Add(ErrorType.Error, "Cannot open file '" + filepathname + "' for writing");
General.WriteLogLine(e.GetType().Name + ": " + e.Message); General.WriteLogLine(e.GetType().Name + ": " + e.Message);
General.ShowErrorMessage("Unable to open file \"" + filepathname + "\" for writing. Make sure the path exists and that the file is not in use by another application.", MessageBoxButtons.OK); General.ShowErrorMessage("Unable to open file \"" + filepathname + "\" for writing. Make sure the path exists and that the file is not in use by another application.", MessageBoxButtons.OK);
return false; return false;
@ -196,7 +196,7 @@ namespace CodeImp.DoomBuilder.Controls
catch(Exception e) catch(Exception e)
{ {
// Failed // Failed
General.ErrorLogger.Add(ErrorType.Error, "Cannot open file '" + filepathname + "' for reading."); General.ErrorLogger.Add(ErrorType.Error, "Cannot open file '" + filepathname + "' for reading");
General.WriteLogLine(e.GetType().Name + ": " + e.Message); General.WriteLogLine(e.GetType().Name + ": " + e.Message);
General.ShowErrorMessage("Unable to open file \"" + filepathname + "\" for reading. Make sure the path exists and that the file is not in use by another application.", MessageBoxButtons.OK); General.ShowErrorMessage("Unable to open file \"" + filepathname + "\" for reading. Make sure the path exists and that the file is not in use by another application.", MessageBoxButtons.OK);
return false; return false;

4
Source/Data/DataManager.cs
View file

@ -624,7 +624,7 @@ namespace CodeImp.DoomBuilder.Data
// Make empty palette when still no palette found // Make empty palette when still no palette found
if(palette == null) if(palette == null)
{ {
General.ErrorLogger.Add(ErrorType.Warning, "None of the loaded resources define a color palette!"); General.ErrorLogger.Add(ErrorType.Warning, "None of the loaded resources define a color palette. Did you forget to configure an IWAD for this configuration?");
palette = new Playpal(); palette = new Playpal();
} }
} }
@ -1121,7 +1121,7 @@ namespace CodeImp.DoomBuilder.Data
if(parser.HasError) if(parser.HasError)
{ {
General.ErrorLogger.Add(ErrorType.Error, "Unable to parse DECORATE data from location " + General.ErrorLogger.Add(ErrorType.Error, "Unable to parse DECORATE data from location " +
dr.Location.location + "! " + parser.ErrorDescription + " on line " + parser.ErrorLine + dr.Location.location + ". " + parser.ErrorDescription + " on line " + parser.ErrorLine +
" in '" + parser.ErrorSource + "'"); " in '" + parser.ErrorSource + "'");
break; break;
} }

2
Source/Data/FileImage.cs
View file

@ -118,7 +118,7 @@ namespace CodeImp.DoomBuilder.Data
// Not loaded? // Not loaded?
if(bitmap == null) if(bitmap == null)
{ {
General.ErrorLogger.Add(ErrorType.Error, "Image file '" + filepathname + "' data format could not be read, while loading texture '" + this.Name + "'!"); General.ErrorLogger.Add(ErrorType.Error, "Image file '" + filepathname + "' data format could not be read, while loading texture '" + this.Name + "'");
loadfailed = true; loadfailed = true;
} }
else else

4
Source/Data/FlatImage.cs
View file

@ -77,7 +77,7 @@ namespace CodeImp.DoomBuilder.Data
if(reader is UnknownImageReader) if(reader is UnknownImageReader)
{ {
// Data is in an unknown format! // Data is in an unknown format!
General.ErrorLogger.Add(ErrorType.Error, "Flat lump '" + Name + "' data format could not be read!"); General.ErrorLogger.Add(ErrorType.Error, "Flat lump '" + Name + "' data format could not be read");
bitmap = null; bitmap = null;
} }
else else
@ -107,7 +107,7 @@ namespace CodeImp.DoomBuilder.Data
else else
{ {
// Missing a patch lump! // Missing a patch lump!
General.ErrorLogger.Add(ErrorType.Error, "Missing flat lump '" + Name + "'!"); General.ErrorLogger.Add(ErrorType.Error, "Missing flat lump '" + Name + "'");
loadfailed = true; loadfailed = true;
} }

6
Source/Data/HighResImage.cs
View file

@ -124,7 +124,7 @@ namespace CodeImp.DoomBuilder.Data
if(reader is UnknownImageReader) if(reader is UnknownImageReader)
{ {
// Data is in an unknown format! // Data is in an unknown format!
General.ErrorLogger.Add(ErrorType.Error, "Patch lump '" + p.lumpname + "' data format could not be read, while loading texture '" + this.Name + "'!"); General.ErrorLogger.Add(ErrorType.Error, "Patch lump '" + p.lumpname + "' data format could not be read, while loading texture '" + this.Name + "'");
loadfailed = true; loadfailed = true;
} }
else else
@ -136,7 +136,7 @@ namespace CodeImp.DoomBuilder.Data
catch(InvalidDataException) catch(InvalidDataException)
{ {
// Data cannot be read! // Data cannot be read!
General.ErrorLogger.Add(ErrorType.Error, "Patch lump '" + p.lumpname + "' data format could not be read, while loading texture '" + this.Name + "'!"); General.ErrorLogger.Add(ErrorType.Error, "Patch lump '" + p.lumpname + "' data format could not be read, while loading texture '" + this.Name + "'");
loadfailed = true; loadfailed = true;
} }
if(patchbmp != null) if(patchbmp != null)
@ -179,7 +179,7 @@ namespace CodeImp.DoomBuilder.Data
else else
{ {
// Missing a patch lump! // Missing a patch lump!
General.ErrorLogger.Add(ErrorType.Error, "Missing patch lump '" + p.lumpname + "' while loading texture '" + this.Name + "'!"); General.ErrorLogger.Add(ErrorType.Error, "Missing patch lump '" + p.lumpname + "' while loading texture '" + this.Name + "'");
loadfailed = true; loadfailed = true;
} }
} }

2
Source/Data/ImageData.cs
View file

@ -240,7 +240,7 @@ namespace CodeImp.DoomBuilder.Data
// Bitmap has incorrect format? // Bitmap has incorrect format?
if(bitmap.PixelFormat != PixelFormat.Format32bppArgb) if(bitmap.PixelFormat != PixelFormat.Format32bppArgb)
{ {
General.ErrorLogger.Add(ErrorType.Warning, "Image '" + name + "' does not have A8R8G8B8 pixel format. Conversion was needed!"); //General.ErrorLogger.Add(ErrorType.Warning, "Image '" + name + "' does not have A8R8G8B8 pixel format. Conversion was needed.");
Bitmap oldbitmap = bitmap; Bitmap oldbitmap = bitmap;
try try
{ {

2
Source/Data/PK3FileImage.cs
View file

@ -102,7 +102,7 @@ namespace CodeImp.DoomBuilder.Data
// Not loaded? // Not loaded?
if(bitmap == null) if(bitmap == null)
{ {
General.ErrorLogger.Add(ErrorType.Error, "Image file '" + filepathname + "' data format could not be read, while loading texture '" + this.Name + "'!"); General.ErrorLogger.Add(ErrorType.Error, "Image file '" + filepathname + "' data format could not be read, while loading texture '" + this.Name + "'");
loadfailed = true; loadfailed = true;
} }
else else

4
Source/Data/SimpleTextureImage.cs
View file

@ -108,7 +108,7 @@ namespace CodeImp.DoomBuilder.Data
// Not loaded? // Not loaded?
if(bitmap == null) if(bitmap == null)
{ {
General.ErrorLogger.Add(ErrorType.Error, "Image lump '" + lumpname + "' data format could not be read, while loading texture '" + this.Name + "'!"); General.ErrorLogger.Add(ErrorType.Error, "Image lump '" + lumpname + "' data format could not be read, while loading texture '" + this.Name + "'");
loadfailed = true; loadfailed = true;
} }
else else
@ -125,7 +125,7 @@ namespace CodeImp.DoomBuilder.Data
} }
else else
{ {
General.ErrorLogger.Add(ErrorType.Error, "Image lump '" + lumpname + "' could not be found, while loading texture '" + this.Name + "'!"); General.ErrorLogger.Add(ErrorType.Error, "Image lump '" + lumpname + "' could not be found, while loading texture '" + this.Name + "'");
loadfailed = true; loadfailed = true;
} }

4
Source/Data/SpriteImage.cs
View file

@ -78,7 +78,7 @@ namespace CodeImp.DoomBuilder.Data
if(reader is UnknownImageReader) if(reader is UnknownImageReader)
{ {
// Data is in an unknown format! // Data is in an unknown format!
General.ErrorLogger.Add(ErrorType.Error, "Sprite lump '" + Name + "' data format could not be read!"); General.ErrorLogger.Add(ErrorType.Error, "Sprite lump '" + Name + "' data format could not be read");
bitmap = null; bitmap = null;
} }
else else
@ -108,7 +108,7 @@ namespace CodeImp.DoomBuilder.Data
else else
{ {
// Missing a patch lump! // Missing a patch lump!
General.ErrorLogger.Add(ErrorType.Error, "Missing sprite lump '" + Name + "'!"); General.ErrorLogger.Add(ErrorType.Error, "Missing sprite lump '" + Name + "'");
} }
// Pass on to base // Pass on to base

6
Source/Data/TextureImage.cs
View file

@ -124,7 +124,7 @@ namespace CodeImp.DoomBuilder.Data
if(reader is UnknownImageReader) if(reader is UnknownImageReader)
{ {
// Data is in an unknown format! // Data is in an unknown format!
General.ErrorLogger.Add(ErrorType.Error, "Patch lump '" + p.lumpname + "' data format could not be read, while loading texture '" + this.Name + "'!"); General.ErrorLogger.Add(ErrorType.Error, "Patch lump '" + p.lumpname + "' data format could not be read, while loading texture '" + this.Name + "'");
loadfailed = true; loadfailed = true;
} }
else else
@ -135,7 +135,7 @@ namespace CodeImp.DoomBuilder.Data
catch(InvalidDataException) catch(InvalidDataException)
{ {
// Data cannot be read! // Data cannot be read!
General.ErrorLogger.Add(ErrorType.Error, "Patch lump '" + p.lumpname + "' data format could not be read, while loading texture '" + this.Name + "'!"); General.ErrorLogger.Add(ErrorType.Error, "Patch lump '" + p.lumpname + "' data format could not be read, while loading texture '" + this.Name + "'");
loadfailed = true; loadfailed = true;
} }
} }
@ -146,7 +146,7 @@ namespace CodeImp.DoomBuilder.Data
else else
{ {
// Missing a patch lump! // Missing a patch lump!
General.ErrorLogger.Add(ErrorType.Error, "Missing patch lump '" + p.lumpname + "' while loading texture '" + this.Name + "'!"); General.ErrorLogger.Add(ErrorType.Error, "Missing patch lump '" + p.lumpname + "' while loading texture '" + this.Name + "'");
loadfailed = true; loadfailed = true;
} }
} }

4
Source/General/MapManager.cs
View file

@ -617,7 +617,7 @@ namespace CodeImp.DoomBuilder
{ {
// Warning only // Warning only
General.ErrorLogger.Add(ErrorType.Warning, e.GetType().Name + ": " + e.Message); General.ErrorLogger.Add(ErrorType.Warning, e.GetType().Name + ": " + e.Message);
General.ErrorLogger.Add(ErrorType.Warning, "Could not write the map settings configuration file!"); General.ErrorLogger.Add(ErrorType.Warning, "Could not write the map settings configuration file");
} }
// Check for compile errors, if the scripts were compiled above // Check for compile errors, if the scripts were compiled above
@ -965,7 +965,7 @@ namespace CodeImp.DoomBuilder
} }
else else
{ {
General.ErrorLogger.Add(ErrorType.Warning, ml.Key.ToString() + " should be copied but was not found!"); General.ErrorLogger.Add(ErrorType.Warning, ml.Key.ToString() + " should be read but was not found in the WAD file");
} }
} }
} }

10
Source/IO/DoomMapSetIO.cs
View file

@ -299,12 +299,12 @@ namespace CodeImp.DoomBuilder.IO
} }
else else
{ {
General.ErrorLogger.Add(ErrorType.Warning, "Sidedef references invalid sector " + sc + "! Sidedef has been removed."); General.ErrorLogger.Add(ErrorType.Warning, "Sidedef references invalid sector " + sc + ". Sidedef has been removed.");
} }
} }
else else
{ {
General.ErrorLogger.Add(ErrorType.Warning, "Linedef references invalid sidedef! Sidedef has been removed."); General.ErrorLogger.Add(ErrorType.Warning, "Linedef references invalid sidedef. Sidedef has been removed.");
} }
} }
@ -330,18 +330,18 @@ namespace CodeImp.DoomBuilder.IO
} }
else else
{ {
General.ErrorLogger.Add(ErrorType.Warning, "Sidedef references invalid sector " + sc + "! Sidedef has been removed."); General.ErrorLogger.Add(ErrorType.Warning, "Sidedef references invalid sector " + sc + ". Sidedef has been removed.");
} }
} }
else else
{ {
General.ErrorLogger.Add(ErrorType.Warning, "Linedef references invalid sidedef! Sidedef has been removed."); General.ErrorLogger.Add(ErrorType.Warning, "Linedef references invalid sidedef. Sidedef has been removed.");
} }
} }
} }
else else
{ {
General.ErrorLogger.Add(ErrorType.Warning, "Linedef references one or more invalid vertices! Linedef has been removed."); General.ErrorLogger.Add(ErrorType.Warning, "Linedef references one or more invalid vertices. Linedef has been removed.");
} }
} }

10
Source/IO/HexenMapSetIO.cs
View file

@ -314,12 +314,12 @@ namespace CodeImp.DoomBuilder.IO
} }
else else
{ {
General.ErrorLogger.Add(ErrorType.Warning, "Sidedef references invalid sector " + sc + "! Sidedef has been removed."); General.ErrorLogger.Add(ErrorType.Warning, "Sidedef references invalid sector " + sc + ". Sidedef has been removed.");
} }
} }
else else
{ {
General.ErrorLogger.Add(ErrorType.Warning, "Linedef references invalid sidedef! Sidedef has been removed."); General.ErrorLogger.Add(ErrorType.Warning, "Linedef references invalid sidedef. Sidedef has been removed.");
} }
} }
@ -345,18 +345,18 @@ namespace CodeImp.DoomBuilder.IO
} }
else else
{ {
General.ErrorLogger.Add(ErrorType.Warning, "Sidedef references invalid sector " + sc + "! Sidedef has been removed."); General.ErrorLogger.Add(ErrorType.Warning, "Sidedef references invalid sector " + sc + ". Sidedef has been removed.");
} }
} }
else else
{ {
General.ErrorLogger.Add(ErrorType.Warning, "Linedef references invalid sidedef! Sidedef has been removed."); General.ErrorLogger.Add(ErrorType.Warning, "Linedef references invalid sidedef. Sidedef has been removed.");
} }
} }
} }
else else
{ {
General.ErrorLogger.Add(ErrorType.Warning, "Linedef references one or more invalid vertices! Linedef has been removed."); General.ErrorLogger.Add(ErrorType.Warning, "Linedef references one or more invalid vertices. Linedef has been removed.");
} }
} }

8
Source/IO/UniversalStreamReader.cs
View file

@ -243,7 +243,7 @@ namespace CodeImp.DoomBuilder.IO
if(s1 < sidescolls.Count) if(s1 < sidescolls.Count)
ReadSidedef(map, sidescolls[s1], l, true, sectorlink); ReadSidedef(map, sidescolls[s1], l, true, sectorlink);
else else
General.ErrorLogger.Add(ErrorType.Warning, "Linedef references invalid sidedef! Sidedef has been removed."); General.ErrorLogger.Add(ErrorType.Warning, "Linedef references invalid sidedef. Sidedef has been removed.");
} }
if(s2 > -1) if(s2 > -1)
@ -251,12 +251,12 @@ namespace CodeImp.DoomBuilder.IO
if(s2 < sidescolls.Count) if(s2 < sidescolls.Count)
ReadSidedef(map, sidescolls[s2], l, false, sectorlink); ReadSidedef(map, sidescolls[s2], l, false, sectorlink);
else else
General.ErrorLogger.Add(ErrorType.Warning, "Linedef references invalid sidedef! Sidedef has been removed."); General.ErrorLogger.Add(ErrorType.Warning, "Linedef references invalid sidedef. Sidedef has been removed.");
} }
} }
else else
{ {
General.ErrorLogger.Add(ErrorType.Warning, "Linedef references one or more invalid vertices! Linedef has been removed."); General.ErrorLogger.Add(ErrorType.Warning, "Linedef references one or more invalid vertices. Linedef has been removed.");
} }
} }
} }
@ -284,7 +284,7 @@ namespace CodeImp.DoomBuilder.IO
} }
else else
{ {
General.ErrorLogger.Add(ErrorType.Warning, "Sidedef references invalid sector " + sector + "! Sidedef has been removed."); General.ErrorLogger.Add(ErrorType.Warning, "Sidedef references invalid sector " + sector + ". Sidedef has been removed.");
} }
} }

10
Source/Plugins/Plugin.cs
View file

@ -77,7 +77,7 @@ namespace CodeImp.DoomBuilder.Plugins
} }
catch(Exception) catch(Exception)
{ {
General.ErrorLogger.Add(ErrorType.Error, "Could not load plugin '" + name + "', the DLL file could not be read!"); General.ErrorLogger.Add(ErrorType.Error, "Could not load plugin '" + name + "', the DLL file could not be read.");
throw new InvalidProgramException(); throw new InvalidProgramException();
} }
@ -89,7 +89,7 @@ namespace CodeImp.DoomBuilder.Plugins
if(FindClasses(typeof(Plug)).Length > 1) if(FindClasses(typeof(Plug)).Length > 1)
{ {
// Show a warning // Show a warning
General.ErrorLogger.Add(ErrorType.Warning, "Plugin '" + name + "' has more than one plug!"); General.ErrorLogger.Add(ErrorType.Warning, "Plugin '" + name + "' has more than one plug.");
} }
// Make plug instance // Make plug instance
@ -99,7 +99,7 @@ namespace CodeImp.DoomBuilder.Plugins
else else
{ {
// How can we plug something in without a plug? // How can we plug something in without a plug?
General.ErrorLogger.Add(ErrorType.Error, "Could not load plugin '" + name + "', plugin is missing the plug!"); General.ErrorLogger.Add(ErrorType.Error, "Could not load plugin '" + name + "', plugin is missing the plug.");
throw new InvalidProgramException(); throw new InvalidProgramException();
} }
@ -189,14 +189,14 @@ namespace CodeImp.DoomBuilder.Plugins
catch(TargetInvocationException e) catch(TargetInvocationException e)
{ {
// Error! // Error!
General.ErrorLogger.Add(ErrorType.Error, "Failed to create class instance '" + t.Name + "' from plugin '" + name + "'!"); General.ErrorLogger.Add(ErrorType.Error, "Failed to create class instance '" + t.Name + "' from plugin '" + name + "'");
General.WriteLogLine(e.InnerException.GetType().Name + ": " + e.InnerException.Message); General.WriteLogLine(e.InnerException.GetType().Name + ": " + e.InnerException.Message);
return default(T); return default(T);
} }
catch(Exception e) catch(Exception e)
{ {
// Error! // Error!
General.ErrorLogger.Add(ErrorType.Error, "Failed to create class instance '" + t.Name + "' from plugin '" + name + "'!"); General.ErrorLogger.Add(ErrorType.Error, "Failed to create class instance '" + t.Name + "' from plugin '" + name + "'");
General.WriteLogLine(e.GetType().Name + ": " + e.Message); General.WriteLogLine(e.GetType().Name + ": " + e.Message);
return default(T); return default(T);
} }

BIN
Tests/Textures/Medricel/textest.wad
View file

Binary file not shown.