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

Merge http://github.com/rheit/zdoom

Browse source
This commit is contained in:
Rachael Alexanderson 2016-10-26 06:10:52 -04:00
commit 692a0034b4
3 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/textures/multipatchtexture.cpp
View file

@ -297,8 +297,6 @@ FMultiPatchTexture::FMultiPatchTexture (const void *texdef, FPatchLookup *patchl
Printf ("Texture %s is left without any patches\n", Name.GetChars()); Printf ("Texture %s is left without any patches\n", Name.GetChars());
} }
CheckForHacks ();
DefinitionLump = deflumpnum; DefinitionLump = deflumpnum;
} }
@ -1328,7 +1326,7 @@ void FMultiPatchTexture::ResolvePatches()
if (texno == id) // we found ourselves. Try looking for another one with the same name which is not a multipatch texture itself. if (texno == id) // we found ourselves. Try looking for another one with the same name which is not a multipatch texture itself.
{ {
TArray<FTextureID> list; TArray<FTextureID> list;
TexMan.ListTextures(Inits[i].TexName, list); TexMan.ListTextures(Inits[i].TexName, list, true);
for (int i = list.Size() - 1; i >= 0; i--) for (int i = list.Size() - 1; i >= 0; i--)
{ {
if (list[i] != id && !TexMan[list[i]]->bMultiPatch) if (list[i] != id && !TexMan[list[i]]->bMultiPatch)
@ -1342,6 +1340,11 @@ void FMultiPatchTexture::ResolvePatches()
if (Inits[i].HasLine) Inits[i].sc.Message(MSG_WARNING, "Texture '%s' references itself as patch\n", Inits[i].TexName.GetChars()); if (Inits[i].HasLine) Inits[i].sc.Message(MSG_WARNING, "Texture '%s' references itself as patch\n", Inits[i].TexName.GetChars());
else Printf(TEXTCOLOR_YELLOW "Texture '%s' references itself as patch\n", Inits[i].TexName.GetChars()); else Printf(TEXTCOLOR_YELLOW "Texture '%s' references itself as patch\n", Inits[i].TexName.GetChars());
} }
else
{
// If it could be resolved, just print a developer warning.
DPrintf(DMSG_WARNING, "Resolved self-referencing texture by picking an older entry for %s", Inits[i].TexName.GetChars());
}
} }
if (!texno.isValid()) if (!texno.isValid())
@ -1372,6 +1375,8 @@ void FMultiPatchTexture::ResolvePatches()
delete[] Inits; delete[] Inits;
Inits = nullptr; Inits = nullptr;
CheckForHacks();
// If this texture is just a wrapper around a single patch, we can simply // If this texture is just a wrapper around a single patch, we can simply
// forward GetPixels() and GetColumn() calls to that patch. // forward GetPixels() and GetColumn() calls to that patch.

13
src/textures/texturemanager.cpp
View file

@ -267,7 +267,7 @@ FTextureID FTextureManager::CheckForTexture (const char *name, int usetype, BITF
// //
//========================================================================== //==========================================================================
int FTextureManager::ListTextures (const char *name, TArray<FTextureID> &list) int FTextureManager::ListTextures (const char *name, TArray<FTextureID> &list, bool listall)
{ {
int i; int i;
@ -293,11 +293,14 @@ int FTextureManager::ListTextures (const char *name, TArray<FTextureID> &list)
// NULL textures must be ignored. // NULL textures must be ignored.
if (tex->UseType!=FTexture::TEX_Null) if (tex->UseType!=FTexture::TEX_Null)
{ {
unsigned int j; unsigned int j = list.Size();
for(j = 0; j < list.Size(); j++) if (!listall)
{ {
// Check for overriding definitions from newer WADs for (j = 0; j < list.Size(); j++)
if (Textures[list[j].GetIndex()].Texture->UseType == tex->UseType) break; {
// Check for overriding definitions from newer WADs
if (Textures[list[j].GetIndex()].Texture->UseType == tex->UseType) break;
}
} }
if (j==list.Size()) list.Push(FTextureID(i)); if (j==list.Size()) list.Push(FTextureID(i));
} }

2
src/textures/textures.h
View file

@ -433,7 +433,7 @@ public:
FTextureID CheckForTexture (const char *name, int usetype, BITFIELD flags=TEXMAN_TryAny); FTextureID CheckForTexture (const char *name, int usetype, BITFIELD flags=TEXMAN_TryAny);
FTextureID GetTexture (const char *name, int usetype, BITFIELD flags=0); FTextureID GetTexture (const char *name, int usetype, BITFIELD flags=0);
int ListTextures (const char *name, TArray<FTextureID> &list); int ListTextures (const char *name, TArray<FTextureID> &list, bool listall = false);
void AddTexturesLump (const void *lumpdata, int lumpsize, int deflumpnum, int patcheslump, int firstdup=0, bool texture1=false); void AddTexturesLump (const void *lumpdata, int lumpsize, int deflumpnum, int patcheslump, int firstdup=0, bool texture1=false);
void AddTexturesLumps (int lump1, int lump2, int patcheslump); void AddTexturesLumps (int lump1, int lump2, int patcheslump);