mirror of
https://git.do.srb2.org/STJr/UltimateZoneBuilder.git
synced 2024-11-27 06:02:11 +00:00
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.
This commit is contained in:
parent
49525177e3
commit
e561d13048
1 changed files with 12 additions and 4 deletions
|
@ -264,12 +264,20 @@ 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))
|
||||||
|
{
|
||||||
|
//INFO: files included or imported inside a library are not visible to the code outside it
|
||||||
|
//and must be included/imported separately
|
||||||
|
if(includetype != IncludeType.LIBRARY)
|
||||||
{
|
{
|
||||||
ReportError("Already parsed \"" + includelump + "\". Check your " + token + " directives");
|
ReportError("Already parsed \"" + includelump + "\". Check your " + token + " directives");
|
||||||
return IgnoreErrors;
|
return IgnoreErrors;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
parsedlumps.Add(includelump);
|
parsedlumps.Add(includelump);
|
||||||
|
}
|
||||||
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue