fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2025-02-13 07:21:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix another stupid bug.

Browse source
This commit is contained in:
Shpoike 2023-07-13 06:21:14 +01:00
parent 0c15adc009
commit d6781a3356
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Quake/gl_texmgr.c
View file

@ -1748,7 +1748,7 @@ static void TexMgr_ColormapTexture_Free(struct gltexture_s *basetex)
{ {
TexMgr_FreeTexture(colourmappedtexture[i].coloured); TexMgr_FreeTexture(colourmappedtexture[i].coloured);
colourmappedtexture[i].basetex = NULL; colourmappedtexture[i].basetex = NULL;
colourmappedtexture[i].usetime = 0; colourmappedtexture[i].usetime = FLT_MIN;
colourmappedtexture[i].coloured = NULL; colourmappedtexture[i].coloured = NULL;
//may be multiple combinations of the same texture. //may be multiple combinations of the same texture.
} }
@ -1761,6 +1761,7 @@ static void TexMgr_ColormapTexture_Free(struct gltexture_s *basetex)
if (colourmappedtexture[i].coloured) if (colourmappedtexture[i].coloured)
TexMgr_FreeTexture(colourmappedtexture[i].coloured); TexMgr_FreeTexture(colourmappedtexture[i].coloured);
colourmappedtexture[i].coloured = NULL; colourmappedtexture[i].coloured = NULL;
colourmappedtexture[i].basetex = NULL;
} }
numcolourmappedtextures = 0; numcolourmappedtextures = 0;
} }
@ -1771,7 +1772,9 @@ struct gltexture_s *TexMgr_ColormapTexture(struct gltexture_s *basetex, plcolour
float otime; float otime;
int i; int i;
struct gltexture_s *glt; struct gltexture_s *glt;
for (i = 0; i < countof(colourmappedtexture); i++) if (!basetex)
return NULL;
for (i = 0; i < numcolourmappedtextures; i++)
{ {
if (colourmappedtexture[i].basetex == basetex && colourmappedtexture[i].upper.key == upper.key && colourmappedtexture[i].lower.key == lower.key) if (colourmappedtexture[i].basetex == basetex && colourmappedtexture[i].upper.key == upper.key && colourmappedtexture[i].lower.key == lower.key)
{ {