OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- changed FTextureManager::ReplaceTexture to only append the new texture instead of replacing the old one.

Browse source 
This should ensure that other references to the original will remain valid.
This commit is contained in:
Christoph Oelckers 2018-12-20 18:10:06 +01:00
commit 120b950291
3 changed files with 5 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/textures/texturemanager.cpp
View file

@ -468,17 +468,10 @@ void FTextureManager::ReplaceTexture (FTextureID picnum, FTexture *newtexture, b
newtexture->Name = oldtexture->Name;
newtexture->UseType = oldtexture->UseType;
Textures[index].Texture = newtexture;
newtexture->id = oldtexture->id;
if (free && !oldtexture->bKeepAround)
{
delete oldtexture;
}
else
{
oldtexture->id.SetInvalid();
}
// Add the new texture at the end of the texture list and clear the old one's name to ensure it won't be found anymore
// We cannot actually replace it because it may be referenced by some other texture.
oldtexture->Name = "";
AddTexture(newtexture);
}
//==========================================================================