fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2025-03-13 22:34:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

wateralpha: allow lava/tele/slime alpha to be set to 0

Browse source
This commit is contained in:
Eric Wasylishen 2014-08-16 23:10:20 -06:00
parent d19dc43311
commit b832815775
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Quake/gl_rmain.c
View file

@ -102,9 +102,9 @@ extern cvar_t r_vfog;
//johnfitz
cvar_t gl_zfix = {"gl_zfix", "1", CVAR_ARCHIVE}; // QuakeSpasm z-fighting fix
cvar_t r_lavaalpha = {"r_lavaalpha","0",CVAR_NONE | CVAR_CALLBACK_IF_UNCHANGED};
cvar_t r_telealpha = {"r_telealpha","0",CVAR_NONE | CVAR_CALLBACK_IF_UNCHANGED};
cvar_t r_slimealpha = {"r_slimealpha","0",CVAR_NONE | CVAR_CALLBACK_IF_UNCHANGED};
cvar_t r_lavaalpha = {"r_lavaalpha","-1",CVAR_NONE | CVAR_CALLBACK_IF_UNCHANGED};
cvar_t r_telealpha = {"r_telealpha","-1",CVAR_NONE | CVAR_CALLBACK_IF_UNCHANGED};
cvar_t r_slimealpha = {"r_slimealpha","-1",CVAR_NONE | CVAR_CALLBACK_IF_UNCHANGED};
qboolean r_drawflat_cheatsafe, r_fullbright_cheatsafe, r_lightmap_cheatsafe, r_drawworld_cheatsafe; //johnfitz

6
Quake/gl_rmisc.c
View file

@ -156,11 +156,11 @@ GL_WaterAlphaForSurfface -- ericw
float GL_WaterAlphaForSurface (msurface_t *fa)
{
if (fa->flags & SURF_DRAWLAVA)
return map_lavaalpha > 0 ? map_lavaalpha : map_wateralpha;
return map_lavaalpha >= 0 ? map_lavaalpha : map_wateralpha;
else if (fa->flags & SURF_DRAWTELE)
return map_telealpha > 0 ? map_telealpha : map_wateralpha;
return map_telealpha >= 0 ? map_telealpha : map_wateralpha;
else if (fa->flags & SURF_DRAWSLIME)
return map_slimealpha > 0 ? map_slimealpha : map_wateralpha;
return map_slimealpha >= 0 ? map_slimealpha : map_wateralpha;
else
return map_wateralpha;
}