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

Fixed, ACS parser: the names of include files bundled with acc compiler should be also checked for duplicate includes from user scripts, unless those user scripts are libraries.

Browse source
This commit is contained in:
MaxED 2016-03-08 21:14:24 +00:00
parent 49525177e3
commit e561d13048
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -265,11 +265,19 @@ namespace CodeImp.DoomBuilder.GZBuilder.GZDoom
// These can also be included several times... // These can also be included several times...
if(parsedlumps.Contains(includelump)) if(parsedlumps.Contains(includelump))
{ {
ReportError("Already parsed \"" + includelump + "\". Check your " + token + " directives"); //INFO: files included or imported inside a library are not visible to the code outside it
return IgnoreErrors; //and must be included/imported separately
if(includetype != IncludeType.LIBRARY)
{
ReportError("Already parsed \"" + includelump + "\". Check your " + token + " directives");
return IgnoreErrors;
}
} }
else
parsedlumps.Add(includelump); {
parsedlumps.Add(includelump);
}
continue; continue;
} }