stjr/UltimateZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/UltimateZoneBuilder.git synced 2024-12-02 16:42:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Internal: removed ambiguous method override.

Browse source
This commit is contained in:
MaxED 2014-10-23 13:04:01 +00:00
parent 6df641564c
commit 05d097a713
2 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Source/Core/GZBuilder/GZDoom/AcsParserSE.cs
View file

@ -39,10 +39,6 @@ namespace CodeImp.DoomBuilder.GZBuilder.GZDoom
return Parse(stream, sourcefilename, false, false); return Parse(stream, sourcefilename, false, false);
} }
public bool Parse(Stream stream, string sourcefilename, bool processIncludes) {
return Parse(stream, sourcefilename, processIncludes, false);
}
public bool Parse(Stream stream, string sourcefilename, bool processIncludes, bool isinclude) { public bool Parse(Stream stream, string sourcefilename, bool processIncludes, bool isinclude) {
base.Parse(stream, sourcefilename); base.Parse(stream, sourcefilename);

2
Source/Core/General/MapManager.cs
View file

@ -1567,7 +1567,7 @@ namespace CodeImp.DoomBuilder {
if (stream != null) { if (stream != null) {
AcsParserSE parser = new AcsParserSE(); AcsParserSE parser = new AcsParserSE();
parser.OnInclude = updateScriptsFromLocation; parser.OnInclude = updateScriptsFromLocation;
parser.Parse(stream, "SCRIPTS", true); parser.Parse(stream, "SCRIPTS", true, false);
if(parser.NamedScripts.Count > 0 && (FormatInterface is DoomMapSetIO || FormatInterface is HexenMapSetIO)) { if(parser.NamedScripts.Count > 0 && (FormatInterface is DoomMapSetIO || FormatInterface is HexenMapSetIO)) {
List<string> names = new List<string>(); List<string> names = new List<string>();