From: lordhavoc <lordhavoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Thu, 28 Feb 2002 10:36:58 +0000 (+0000)
Subject: fixed fogging on models and opaque liquids (teleport/lava)
X-Git-Tag: RELEASE_0_2_0_RC1~600
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e83f9c385a9bd3ca062839b8322ba2583888f664;p=xonotic%2Fdarkplaces.git

fixed fogging on models and opaque liquids (teleport/lava)


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

diff --git a/gl_models.c b/gl_models.c
index 63869689..55eadf2b 100644
--- a/gl_models.c
+++ b/gl_models.c
@@ -440,7 +440,7 @@ void R_DrawQ1Q2AliasModel (void)
 	else
 		R_DrawModelMesh(0, NULL, 1 - fog, 1 - fog, 1 - fog);
 
-	if (fog && aliasmeshinfo.blendfunc2 != GL_ONE)
+	if (fog && !(currentrenderentity->effects & EF_ADDITIVE))
 	{
 		aliasmeshinfo.tex[0] = R_GetTexture(skinframe->fog);
 		aliasmeshinfo.blendfunc1 = GL_SRC_ALPHA;
diff --git a/gl_rsurf.c b/gl_rsurf.c
index 494a93a5..930b6ab5 100644
--- a/gl_rsurf.c
+++ b/gl_rsurf.c
@@ -750,7 +750,7 @@ static void RSurfShader_Water_Pass_Base(msurface_t *s)
 	}
 	if (s->dlightframe == r_framecount && !(s->flags & SURF_DRAWFULLBRIGHT))
 		RSurf_Light(s->dlightbits, m.numverts);
-	if (fogenabled/* && m.blendfunc2 == GL_ONE_MINUS_SRC_ALPHA*/)
+	if (fogenabled && (s->flags & SURF_DRAWNOALPHA))
 	{
 		for (i = 0, sv = svert;i < m.numverts;i++, sv++)
 		{
@@ -878,9 +878,10 @@ static int RSurfShader_Water(int stage, msurface_t *s)
 			RSurfShader_Water_Pass_Glow(s);
 		return false;
 	case 2:
-		if (fogenabled && (s->flags & SURF_DRAWNOALPHA))
+		if (fogenabled)
 		{
-			RSurfShader_Water_Pass_Fog(s);
+			if (s->flags & SURF_DRAWNOALPHA)
+				RSurfShader_Water_Pass_Fog(s);
 			return false;
 		}
 		else