Merge remote-tracking branch 'remotes/zdoom/master'

This commit is contained in:
Christoph Oelckers 2016-12-06 22:47:53 +01:00
commit 6271ecf2af

View file

@ -414,7 +414,14 @@ void ParseScripts()
while ((lump = Wads.FindLump("ZSCRIPT", &lastlump)) != -1) while ((lump = Wads.FindLump("ZSCRIPT", &lastlump)) != -1)
{ {
DoParse(lump); DoParse(lump);
if (!Args->CheckParm("-zscript"))
{
return;
}
} }
Printf(TEXTCOLOR_PURPLE "WARNING!!!\n");
Printf(TEXTCOLOR_PURPLE "As of this version, Zscript is still considered a feature in development which can change " TEXTCOLOR_RED "WITHOUT WARNING!!!\n");
Printf(TEXTCOLOR_PURPLE "Use at your own risk!\n");
} }