fog water when r_wateralpha is 1

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@1642 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/gl_rsurf.c b/gl_rsurf.c
index 930b6ab53828240401520a3c0d474360c4713063..6a9650118c678a1835636b540bd17d0cad98a346 100644 (file)
--- a/gl_rsurf.c
+++ b/gl_rsurf.c
@@ -880,7 +880,7 @@ static int RSurfShader_Water(int stage, msurface_t *s)
        case 2:
                if (fogenabled)
                {
-                       if (s->flags & SURF_DRAWNOALPHA)
+                       if (currentrenderentity->alpha * (s->flags & SURF_DRAWNOALPHA ? 1 : r_wateralpha.value) >= 1.0f)
                                RSurfShader_Water_Pass_Fog(s);
                        return false;
                }