From 3874cf365cfa6d769aa2400e39773927932928bc Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Thu, 8 Dec 2022 12:43:37 +0100 Subject: [PATCH] - use TEXMAN_ForceLookup where it was missing. --- source/common/models/model.cpp | 2 +- source/core/models/modeldata.cpp | 2 +- source/core/textures/hightile.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/common/models/model.cpp b/source/common/models/model.cpp index 377de6117..c93fa7876 100644 --- a/source/common/models/model.cpp +++ b/source/common/models/model.cpp @@ -121,7 +121,7 @@ FTextureID LoadSkin(const char * path, const char * fn) int texlump = FindGFXFile(buffer); const char * const texname = texlump < 0 ? fn : fileSystem.GetFileFullName(texlump); - return TexMan.CheckForTexture(texname, ETextureType::Any, FTextureManager::TEXMAN_TryAny); + return TexMan.CheckForTexture(texname, ETextureType::Any, FTextureManager::TEXMAN_TryAny | FTextureManager::TEXMAN_ForceLookup); } //=========================================================================== diff --git a/source/core/models/modeldata.cpp b/source/core/models/modeldata.cpp index d2dcb3730..6739860ed 100644 --- a/source/core/models/modeldata.cpp +++ b/source/core/models/modeldata.cpp @@ -125,7 +125,7 @@ int ModelManager::DefineSkin(int modelid, const char* skinfn, int palnum, int sk skdef->param = param; skdef->specpower = specpower; skdef->specfactor = specfactor; - skdef->texture = TexMan.CheckForTexture(skinfn, ETextureType::Any); + skdef->texture = TexMan.CheckForTexture(skinfn, ETextureType::Any, FTextureManager::TEXMAN_ForceLookup | FTextureManager::TEXMAN_TryAny); if (!skdef->texture.isValid()) return -2; return 0; } diff --git a/source/core/textures/hightile.cpp b/source/core/textures/hightile.cpp index f4e7d6774..e385b0a26 100644 --- a/source/core/textures/hightile.cpp +++ b/source/core/textures/hightile.cpp @@ -299,7 +299,7 @@ int tileSetSkybox(int picnum, int palnum, FString* facenames, bool indexed) FGameTexture *faces[6]; for (int i = 0; i < 6; i++) { - FTextureID texid = TexMan.CheckForTexture(facenames[i], ETextureType::Any, FTextureManager::TEXMAN_ForceLookup); + FTextureID texid = TexMan.CheckForTexture(facenames[i], ETextureType::Any, FTextureManager::TEXMAN_TryAny | FTextureManager::TEXMAN_ForceLookup); if (!texid.isValid()) { Printf("%s: Skybox image for tile %d does not exist or is invalid\n", facenames[i].GetChars(), picnum);