zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-27 06:12:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

Don't abort for TEXTUREx lumps that define textures with no patches

Browse source 
- A texture defined in TEXTUREx without any patches isn't necessarily an
  error, so accept. This also means they shouldn't be used for determining
  if a TEXTURE directory belongs to Strife instead of Doom.
This commit is contained in:
Randy Heit 2013-08-30 23:10:20 -05:00
parent b0371e1804
commit 260ce62175
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/textures/multipatchtexture.cpp
View file

@ -233,13 +233,13 @@ FMultiPatchTexture::FMultiPatchTexture (const void *texdef, FPatchLookup *patchl
NumParts = SAFESHORT(mtexture.d->patchcount); NumParts = SAFESHORT(mtexture.d->patchcount);
} }
if (NumParts <= 0) if (NumParts < 0)
{ {
I_FatalError ("Bad texture directory"); I_FatalError ("Bad texture directory");
} }
UseType = FTexture::TEX_Wall; UseType = FTexture::TEX_Wall;
Parts = new TexPart[NumParts]; Parts = NumParts > 0 ? new TexPart[NumParts] : NULL;
Width = SAFESHORT(mtexture.d->width); Width = SAFESHORT(mtexture.d->width);
Height = SAFESHORT(mtexture.d->height); Height = SAFESHORT(mtexture.d->height);
strncpy (Name, (const char *)mtexture.d->name, 8); strncpy (Name, (const char *)mtexture.d->name, 8);
@ -906,7 +906,7 @@ void FTextureManager::AddTexturesLump (const void *lumpdata, int lumpsize, int d
// There is bizzarely a Doom editing tool that writes to the // There is bizzarely a Doom editing tool that writes to the
// first two elements of columndirectory, so I can't check those. // first two elements of columndirectory, so I can't check those.
if (SAFESHORT(tex->patchcount) <= 0 || if (SAFESHORT(tex->patchcount) < 0 ||
tex->columndirectory[2] != 0 || tex->columndirectory[2] != 0 ||
tex->columndirectory[3] != 0) tex->columndirectory[3] != 0)
{ {