nzp-team/quakespasm
0
0
Fork 0
mirror of https://github.com/nzp-team/quakespasm.git synced 2024-11-28 22:52:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Restore oddity

Browse source
This commit is contained in:
unknown 2022-04-08 13:33:00 -04:00
parent a56558ceb9
commit bae5afbef9
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
source/gl_model.c
View file

@ -2488,6 +2488,7 @@ void *Mod_LoadAllSkins (int numskins, daliasskintype_t *pskintype)
//spike - external model textures with dp naming -- eg progs/foo.mdl_0.tga //spike - external model textures with dp naming -- eg progs/foo.mdl_0.tga
//always use the alpha channel for external images. gpus prefer aligned data anyway. //always use the alpha channel for external images. gpus prefer aligned data anyway.
char filename[MAX_QPATH]; char filename[MAX_QPATH];
char filename2[MAX_QPATH];
byte *data; byte *data;
int fwidth = 0, fheight = 0; int fwidth = 0, fheight = 0;
qboolean malloced=false; qboolean malloced=false;
@ -2500,7 +2501,6 @@ void *Mod_LoadAllSkins (int numskins, daliasskintype_t *pskintype)
SRC_RGBA, data, filename, 0, TEXPREF_ALPHA|texflags|TEXPREF_MIPMAP ); SRC_RGBA, data, filename, 0, TEXPREF_ALPHA|texflags|TEXPREF_MIPMAP );
//now try to load glow/luma image from the same place //now try to load glow/luma image from the same place
Hunk_FreeToLowMark (mark);
q_snprintf (filename2, sizeof(filename2), "%s_glow", filename); q_snprintf (filename2, sizeof(filename2), "%s_glow", filename);
data = Image_LoadImage (filename2, &fwidth, &fheight); data = Image_LoadImage (filename2, &fwidth, &fheight);
if (!data) if (!data)
@ -2510,8 +2510,11 @@ void *Mod_LoadAllSkins (int numskins, daliasskintype_t *pskintype)
} }
if (data) if (data)
tx->fullbright = TexMgr_LoadImage (loadmodel, filename2, fwidth, fheight, pheader->fbtextures[i][0]t = TexMgr_LoadImage (loadmodel, filename2, fwidth, fheight,
SRC_RGBA, data, filename, 0, TEXPREF_MIPMAP | extraflags ); SRC_RGBA, data, filename, 0, TEXPREF_ALPHA|texflags|TEXPREF_MIPMAP );
else
pheader->fbtextures[i][0] = NULL;
} else { } else {
//johnfitz -- rewritten //johnfitz -- rewritten