qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-01-18 06:51:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Check for %s_luma as well as %s_glow. Also a bit of whitespace.

Browse source
This commit is contained in:
Ragnvald Maartmann-Moe IV 2004-01-04 01:20:20 +00:00
parent bd561fafc3
commit 043c1ce466
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
libs/models/alias/gl_model_alias.c
View file

@ -286,14 +286,18 @@ Mod_LoadExternalSkin (maliasskindesc_t *pskindesc, char *filename)
pskindesc->fb_texnum = 0; pskindesc->fb_texnum = 0;
glow = LoadImage (va ("%s_glow", filename)); glow = LoadImage (va ("%s_luma", filename));
if (!glow)
glow = LoadImage (va ("%s_glow", filename));
if (!glow)
glow = LoadImage (va ("textures/%s_luma", ptr));
if (!glow) if (!glow)
glow = LoadImage (va ("textures/%s_glow", ptr)); glow = LoadImage (va ("textures/%s_glow", ptr));
if (glow) if (glow)
pskindesc->fb_texnum = GL_LoadTexture (va ("fb_%s", filename), pskindesc->fb_texnum =
glow->width, glow->height, GL_LoadTexture (va ("fb_%s", filename), glow->width,
glow->data, true, true, glow->height, glow->data, true, true,
glow->format > 2 ? glow->format : 1); glow->format > 2 ? glow->format : 1);
else if (tex->format < 3) else if (tex->format < 3)
pskindesc->fb_texnum = Mod_Fullbright (tex->data, tex->width, pskindesc->fb_texnum = Mod_Fullbright (tex->data, tex->width,
tex->height, tex->height,