- fixed: old-style DECORATE definitions with non-alphanumeric characters in

the name produced an error.


SVN r2025 (trunk)
This commit is contained in:
Christoph Oelckers 2009-12-13 22:22:25 +00:00
parent 28c23edb2f
commit ba106c28c4
3 changed files with 5 additions and 4 deletions

View file

@ -1,3 +1,7 @@
December 13, 2009 (Changes by Graf Zahl)
- fixed: old-style DECORATE definitions with non-alphanumeric characters in
the name produced an error.
December 12, 2009
- Added a DMG_NO_FACTOR flag for P_DamageMobj(). A_KillChildren, A_KillMaster,
and A_KillSiblings now use it.

View file

@ -229,7 +229,7 @@ void FWarp2Texture::MakeTexture (DWORD time)
FTexture *FWarpTexture::GetRedirect(bool wantwarped)
{
if (!wantwarped) return SourcePic;
if (!wantwarped) return SourcePic->GetRedirect(false);
else return this;
}

View file

@ -1229,9 +1229,6 @@ void ParseDecorate (FScanner &sc)
break;
}
default:
// without the option of game filters following, anything but an opening brace
// here means a syntax error.
sc.MustGetStringName("{");
sc.RestorePos(pos);
ParseOldDecoration(sc, DEF_Decoration);
break;