- Added Martin Howe's morph system update.

- Added support for defining composite textures in HIRESTEX. It is not fully tested
  and right now can't do much more than the old TEXTUREx method.
- Added a few NULL pointer checks to the texture code.
- Made duplicate class names in DECORATE non-fatal. There is really no stability
  concern here and the worst that can happen is that the wrong actor is spawned.
  This was a constant hassle when testing with WADs that contain duplicate resources.


SVN r905 (trunk)
This commit is contained in:
Christoph Oelckers 2008-04-12 15:31:18 +00:00
commit 6b2a7b8b03
19 changed files with 277 additions and 47 deletions

View file

@ -322,14 +322,16 @@ FFont::FFont (const char *name, const char *nametemplate, int first, int count,
stcfn121 = true;
}
}
if (lump != -1 || i != 124-start || !stcfn121)
charlumps[i] = lump;
if (lump >= 0)
{
FTexture *pic = TexMan[buffer];
if (pic != NULL)
{
// set the lump here only if it represents a valid texture
if (i != 124-start || !stcfn121)
charlumps[i] = lump;
int height = pic->GetScaledHeight();
int yoffs = pic->GetScaledTopOffset();
@ -1200,7 +1202,7 @@ FFontChar1::FFontChar1 (int sourcelump, const BYTE *sourceremap)
Name[0] = 0; // Make this texture unnamed
// now copy all the properties from the base texture
CopySize(BaseTexture);
if (BaseTexture != NULL) CopySize(BaseTexture);
Pixels = NULL;
}