rain splatters on the ground and water, and turns to steam on slime/lava, bubbles...

[xonotic/darkplaces.git] / gl_rmain.c

diff --git a/gl_rmain.c b/gl_rmain.c
index 94cf4e36b94a8056e34c5eb404a8ee80f4da0717..75cc0c374ad0e4d0ecd44af6b1a3087ef9493dfb 100644 (file)
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -131,6 +131,8 @@ void FOG_framebegin()
        }
        if (glfog.value)
        {
+               if (!r_render.value)
+                       return;
                if(fog_density)
                {
                        // LordHavoc: Borland C++ 5.0 was choking on this line, stupid compiler...
@@ -397,8 +399,8 @@ R_DrawSpriteModel
 void R_DrawSpriteModel (entity_t *e)
 {
        mspriteframe_t  *oldframe, *newframe;
-       float           *up, *right, lerp, ilerp;
-       vec3_t          v_forward, v_right, v_up, org;
+       float                   lerp, ilerp;
+       vec3_t                  forward, right, up, org;
        msprite_t               *psprite;
 
        // don't even bother culling, because it's just a single
@@ -413,15 +415,13 @@ void R_DrawSpriteModel (entity_t *e)
 
        if (psprite->type == SPR_ORIENTED)
        {       // bullet marks on walls
-               AngleVectors (e->angles, v_forward, v_right, v_up);
-               up = v_up;
-               right = v_right;
+               AngleVectors (e->angles, forward, right, up);
                VectorSubtract(e->origin, vpn, org);
        }
        else
        {       // normal sprite
-               up = vup;
-               right = vright;
+               VectorCopy(vup, up);
+               VectorCopy(vright, right);
                VectorCopy(e->origin, org);
        }
        if (e->scale != 1)
@@ -637,6 +637,8 @@ void R_SetupGL (void)
        extern  int glwidth, glheight;
        int             x, x2, y2, y, w, h;
 
+       if (!r_render.value)
+               return;
        //
        // set up viewpoint
        //
@@ -715,6 +717,8 @@ R_Clear
 */
 void R_Clear (void)
 {
+       if (!r_render.value)
+               return;
 //     glClear (GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); // LordHavoc: moved to SCR_UpdateScreen
        gldepthmin = 0;
        gldepthmax = 1;
@@ -726,6 +730,8 @@ void R_Clear (void)
 // LordHavoc: my trick to *FIX* GLQuake lighting once and for all :)
 void GL_Brighten()
 {
+       if (!r_render.value)
+               return;
        glMatrixMode(GL_PROJECTION);
     glLoadIdentity ();
        glOrtho  (0, vid.width, vid.height, 0, -99999, 99999);
@@ -755,6 +761,8 @@ extern cvar_t gl_lightmode;
 
 void GL_BlendView()
 {
+       if (!r_render.value)
+               return;
        glMatrixMode(GL_PROJECTION);
     glLoadIdentity ();
        glOrtho  (0, vid.width, vid.height, 0, -99999, 99999);