teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-11-15 00:41:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

- use TEXMAN_ForceLookup where it was missing.

Browse source
This commit is contained in:
Christoph Oelckers 2022-12-08 12:43:37 +01:00
parent c1abd6fe22
commit 3874cf365c
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/common/models/model.cpp
View file

@ -121,7 +121,7 @@ FTextureID LoadSkin(const char * path, const char * fn)
int texlump = FindGFXFile(buffer); int texlump = FindGFXFile(buffer);
const char * const texname = texlump < 0 ? fn : fileSystem.GetFileFullName(texlump); 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);
} }
//=========================================================================== //===========================================================================

2
source/core/models/modeldata.cpp
View file

@ -125,7 +125,7 @@ int ModelManager::DefineSkin(int modelid, const char* skinfn, int palnum, int sk
skdef->param = param; skdef->param = param;
skdef->specpower = specpower; skdef->specpower = specpower;
skdef->specfactor = specfactor; 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; if (!skdef->texture.isValid()) return -2;
return 0; return 0;
} }

2
source/core/textures/hightile.cpp
View file

@ -299,7 +299,7 @@ int tileSetSkybox(int picnum, int palnum, FString* facenames, bool indexed)
FGameTexture *faces[6]; FGameTexture *faces[6];
for (int i = 0; i < 6; i++) 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()) if (!texid.isValid())
{ {
Printf("%s: Skybox image for tile %d does not exist or is invalid\n", facenames[i].GetChars(), picnum); Printf("%s: Skybox image for tile %d does not exist or is invalid\n", facenames[i].GetChars(), picnum);