From: lordhavoc <lordhavoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Wed, 13 Mar 2002 23:57:42 +0000 (+0000)
Subject: fog water when r_wateralpha is 1
X-Git-Tag: RELEASE_0_2_0_RC1~583
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=d78cdd63e8c9863fde7f614ce22371b7f7894869;p=xonotic%2Fdarkplaces.git

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 930b6ab5..6a965011 100644
--- 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;
 		}