fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2025-04-20 09:55:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

R_SetWateralpha_f: add cl.worldmodel null check

Browse source
This commit is contained in:
Eric Wasylishen 2017-05-08 18:41:41 -07:00
parent 746d3a72b0
commit 5a9d2fad9e
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
quakespasm/Quake/gl_rmisc.c
View file

@ -116,7 +116,7 @@ R_SetWateralpha_f -- ericw
*/
static void R_SetWateralpha_f (cvar_t *var)
{
if (cls.state && !(cl.worldmodel->contentstransparent&SURF_DRAWWATER) && var->value < 1)
if (cls.state && cl.worldmodel && !(cl.worldmodel->contentstransparent&SURF_DRAWWATER) && var->value < 1)
Con_Warning("Map does not appear to be water-vised\n");
map_wateralpha = var->value;
map_fallbackalpha = var->value;
@ -129,7 +129,8 @@ R_SetLavaalpha_f -- ericw
*/
static void R_SetLavaalpha_f (cvar_t *var)
{
if (cls.state && !(cl.worldmodel->contentstransparent&SURF_DRAWLAVA) && var->value && var->value < 1)
if (cls.state && cl.worldmodel &&
!(cl.worldmodel->contentstransparent&SURF_DRAWLAVA) && var->value && var->value < 1)
Con_Warning("Map does not appear to be lava-vised\n");
map_lavaalpha = var->value;
}
@ -141,7 +142,7 @@ R_SetTelealpha_f -- ericw
*/
static void R_SetTelealpha_f (cvar_t *var)
{
if (cls.state && !(cl.worldmodel->contentstransparent&SURF_DRAWTELE) && var->value && var->value < 1)
if (cls.state && cl.worldmodel && !(cl.worldmodel->contentstransparent&SURF_DRAWTELE) && var->value && var->value < 1)
Con_Warning("Map does not appear to be tele-vised\n");
map_telealpha = var->value;
}
@ -153,7 +154,7 @@ R_SetSlimealpha_f -- ericw
*/
static void R_SetSlimealpha_f (cvar_t *var)
{
if (cls.state && !(cl.worldmodel->contentstransparent&SURF_DRAWSLIME) && var->value && var->value < 1)
if (cls.state && cl.worldmodel && !(cl.worldmodel->contentstransparent&SURF_DRAWSLIME) && var->value && var->value < 1)
Con_Warning("Map does not appear to be slime-vised\n");
map_slimealpha = var->value;
}