- Fixed: The TEXTURES parser didn't report an error for invalid keywords.

- Fixed: The DECORATE expression evaluator was too strict with missing jump labels.
  For compatibility it only may print a warning, not an error.


SVN r1284 (trunk)
This commit is contained in:
Christoph Oelckers 2008-11-08 08:29:51 +00:00
parent f1ae8119ab
commit e56fef0a8e
3 changed files with 15 additions and 2 deletions

View file

@ -1,3 +1,8 @@
November 2, 2008 (Changes by Graf Zahl)
- Fixed: The TEXTURES parser didn't report an error for invalid keywords.
- Fixed: The DECORATE expression evaluator was too strict with missing jump labels.
For compatibility it only may print a warning, not an error.
October 29, 2008 (Changes by Graf Zahl) October 29, 2008 (Changes by Graf Zahl)
- Fixed: FxClassTypeCast::Resolve didn't work for NULL classes because a variable - Fixed: FxClassTypeCast::Resolve didn't work for NULL classes because a variable
was not initialized. was not initialized.

View file

@ -596,6 +596,10 @@ void FTextureManager::LoadTextureDefs(int wadnum, const char *lumpname)
{ {
ParseXTexture(sc, FTexture::TEX_MiscPatch); ParseXTexture(sc, FTexture::TEX_MiscPatch);
} }
else
{
sc.ScriptError("Texture definition expected, found '%s'", sc.String);
}
} }
} }
} }

View file

@ -2634,9 +2634,13 @@ FxExpression *FxMultiNameState::Resolve(FCompileContext &ctx)
if (destination == NULL) if (destination == NULL)
{ {
ScriptPosition.Message(ctx.lax? MSG_WARNING:MSG_ERROR, "Unknown state jump destination"); ScriptPosition.Message(ctx.lax? MSG_WARNING:MSG_ERROR, "Unknown state jump destination");
if (!ctx.lax)
{
delete this; delete this;
return NULL; return NULL;
} }
return this;
}
FxExpression *x = new FxConstant(destination, ScriptPosition); FxExpression *x = new FxConstant(destination, ScriptPosition);
delete this; delete this;
return x; return x;