mirror of
https://github.com/ZDoom/gzdoom.git
synced 2024-11-10 14:51:40 +00:00
- fixed: old-style DECORATE definitions with non-alphanumeric characters in
the name produced an error. SVN r2025 (trunk)
This commit is contained in:
parent
28c23edb2f
commit
ba106c28c4
3 changed files with 5 additions and 4 deletions
|
@ -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.
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue