OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- added a 'listall' option to FTextureManager::ListTextures, so that the multipatchtexture lookup can find multiple older versions with the same use type.

Browse source 
This fixes an issue with DUMP 2 which looked for patches of the same name as the texture currently being defined and where the patches had the same use type as the composite texture. The function as implemented would only find the newly added composite and print an error.
This commit is contained in:
Christoph Oelckers 2016-10-26 11:56:15 +02:00
commit 28fefdabc7
3 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/textures/multipatchtexture.cpp
View file

@ -1324,7 +1324,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.
{
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--)
{
if (list[i] != id && !TexMan[list[i]]->bMultiPatch)