From 7da71c86733756555cb31a476f3713fa0999cbeb Mon Sep 17 00:00:00 2001
From: "Anton E. Gavrilov" <tonik@vipmail.ru>
Date: Sat, 18 Mar 2000 03:35:10 +0000
Subject: [PATCH] v_contentblend works in both QW and uquake now; also, it is a
 float (not toggle) now.

---
 common/view.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/common/view.c b/common/view.c
index 05efc46..f93d18d 100644
--- a/common/view.c
+++ b/common/view.c
@@ -438,12 +438,11 @@ V_BonusFlash_f ( void )
 void
 V_SetContentsColor (int contents)
 {
-#ifdef QUAKEWORLD
 	if (!v_contentblend->value) {
 		cl.cshifts[CSHIFT_CONTENTS] = cshift_empty;
 		return;
 	}
-#endif
+
 	switch (contents)
 	{
 	case CONTENTS_SOLID:
@@ -464,6 +463,9 @@ V_SetContentsColor (int contents)
 	default:
 		cl.cshifts[CSHIFT_CONTENTS] = cshift_water;
 	}
+
+	if (v_contentblend->value > 0 && v_contentblend->value < 1)
+		cl.cshifts[CSHIFT_CONTENTS].percent *= v_contentblend->value;
 }
 
 /*