stjr/UltimateZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/UltimateZoneBuilder.git synced 2024-11-26 22:01:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

A warning is now displayed when an unclosed marker range is found in a WAD (e.g. when there's a S_START, but no S_END after it).

Browse source
This commit is contained in:
MaxED 2014-10-31 13:53:43 +00:00
parent ecaf9331d9
commit cefb66ca16
1 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
Source/Core/Data/WADReader.cs
View file

@ -172,6 +172,10 @@ namespace CodeImp.DoomBuilder.Data
// This fills a ranges list
private void FindRanges(List<LumpRange> ranges, IDictionary rangeinfos, string rangename)
{
Dictionary<LumpRange, KeyValuePair<string, string>> failedranges = new Dictionary<LumpRange, KeyValuePair<string, string>>(); //mxd
Dictionary<int, bool> successfulrangestarts = new Dictionary<int, bool>(); //mxd
Dictionary<int, bool> failedrangestarts = new Dictionary<int, bool>(); //mxd
foreach(DictionaryEntry r in rangeinfos)
{
// Read start and end
@ -188,16 +192,31 @@ namespace CodeImp.DoomBuilder.Data
range.end = file.FindLumpIndex(rangeend, startindex);
if(range.end > -1)
{
if(!successfulrangestarts.ContainsKey(startindex)) successfulrangestarts.Add(startindex, false); //mxd
ranges.Add(range);
startindex = file.FindLumpIndex(rangestart, range.end);
}
else
{
//mxd
if (!failedrangestarts.ContainsKey(startindex))
{
failedranges.Add(range, new KeyValuePair<string, string>(rangestart, rangeend)); //mxd
failedrangestarts.Add(startindex, false);
}
startindex = -1;
}
}
}
}
//mxd. Display warnings for unclosed ranges
foreach (KeyValuePair<LumpRange, KeyValuePair<string, string>> group in failedranges)
{
if(successfulrangestarts.ContainsKey(group.Key.start)) continue;
General.ErrorLogger.Add(ErrorType.Warning, "'" + group.Value.Key + "' range at index " + group.Key.start + " is not closed in '" + location.location + "' ('" + group.Value.Value + "' marker is missing)!");
}
}
#endregion