stjr/UltimateZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/UltimateZoneBuilder.git synced 2025-02-18 10:01:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

DeHackEd: fixed and issue where the "#" in "ID #" fields was erroneously interpreted as a comment. Fixes #735

Browse source
This commit is contained in:
biwa 2022-05-15 00:32:21 +02:00
parent d08bc4438b
commit df29245a59
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Source/Core/Dehacked/DehackedParser.cs
View file

@ -195,9 +195,19 @@ namespace CodeImp.DoomBuilder.Dehacked
linenumber++; linenumber++;
string line = datareader.ReadLine(); string line = datareader.ReadLine();
// Cut everything from the line after a #, unless it's a editor key (#$)
if (line != null) if (line != null)
return Regex.Replace(line, @"(#[^$].+)", "", RegexOptions.IgnoreCase).Trim(); {
line = line.Trim();
// Editor key?
if (line.StartsWith("$#"))
return line;
// Cut everything from the line after a #, unless it's the "ID #" field, then cut everything after then next #
// This is technically against the (nowhere officially defined) DeHackEd specs, but of course people manually
// added comments at the end of lines anyway and got away with it
return Regex.Replace(line, @"\s*(id\s+#)?([^#]*)(#[^$].+)?", "$1$2", RegexOptions.IgnoreCase).Trim();
}
return null; return null;
} }