From 67a9a2a04629ab033e4cbf39124b9fbbf39c6128 Mon Sep 17 00:00:00 2001
From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Sun, 7 Dec 2003 08:01:01 +0000
Subject: [PATCH] added CSHIFT_VCSHIFT blend so v_cshift now affects underwater
 blending (as well as other liquids) for more consistent behavior, and
 disabled powerup blends in transfusion (at their request)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@3689 d7cf8633-e32d-0410-b094-e92efae38249
---
 client.h |  3 ++-
 view.c   | 72 +++++++++++++++++++++++++++++++-------------------------
 2 files changed, 42 insertions(+), 33 deletions(-)

diff --git a/client.h b/client.h
index c588db9d..578cd684 100644
--- a/client.h
+++ b/client.h
@@ -231,7 +231,8 @@ typedef struct
 #define	CSHIFT_DAMAGE	1
 #define	CSHIFT_BONUS	2
 #define	CSHIFT_POWERUP	3
-#define	NUM_CSHIFTS		4
+#define	CSHIFT_VCSHIFT	4
+#define	NUM_CSHIFTS		5
 
 #define	NAME_LENGTH	64
 
diff --git a/view.c b/view.c
index edb23b98..49879479 100644
--- a/view.c
+++ b/view.c
@@ -450,10 +450,10 @@ void V_CalcViewBlend(void)
 		{
 		case CONTENTS_EMPTY:
 		case CONTENTS_SOLID:
-			cl.cshifts[CSHIFT_CONTENTS].destcolor[0] = v_cshift.destcolor[0];
-			cl.cshifts[CSHIFT_CONTENTS].destcolor[1] = v_cshift.destcolor[1];
-			cl.cshifts[CSHIFT_CONTENTS].destcolor[2] = v_cshift.destcolor[2];
-			cl.cshifts[CSHIFT_CONTENTS].percent = v_cshift.percent;
+			cl.cshifts[CSHIFT_CONTENTS].destcolor[0] = 0;
+			cl.cshifts[CSHIFT_CONTENTS].destcolor[1] = 0;
+			cl.cshifts[CSHIFT_CONTENTS].destcolor[2] = 0;
+			cl.cshifts[CSHIFT_CONTENTS].percent = 0;
 			break;
 		case CONTENTS_LAVA:
 			cl.cshifts[CSHIFT_CONTENTS].destcolor[0] = 255;
@@ -474,36 +474,44 @@ void V_CalcViewBlend(void)
 			cl.cshifts[CSHIFT_CONTENTS].percent = 128 >> 1;
 		}
 
-		if (cl.items & IT_QUAD)
-		{
-			cl.cshifts[CSHIFT_POWERUP].destcolor[0] = 0;
-			cl.cshifts[CSHIFT_POWERUP].destcolor[1] = 0;
-			cl.cshifts[CSHIFT_POWERUP].destcolor[2] = 255;
-			cl.cshifts[CSHIFT_POWERUP].percent = 30;
-		}
-		else if (cl.items & IT_SUIT)
-		{
-			cl.cshifts[CSHIFT_POWERUP].destcolor[0] = 0;
-			cl.cshifts[CSHIFT_POWERUP].destcolor[1] = 255;
-			cl.cshifts[CSHIFT_POWERUP].destcolor[2] = 0;
-			cl.cshifts[CSHIFT_POWERUP].percent = 20;
-		}
-		else if (cl.items & IT_INVISIBILITY)
-		{
-			cl.cshifts[CSHIFT_POWERUP].destcolor[0] = 100;
-			cl.cshifts[CSHIFT_POWERUP].destcolor[1] = 100;
-			cl.cshifts[CSHIFT_POWERUP].destcolor[2] = 100;
-			cl.cshifts[CSHIFT_POWERUP].percent = 100;
-		}
-		else if (cl.items & IT_INVULNERABILITY)
+		if (gamemode != GAME_TRANSFUSION)
 		{
-			cl.cshifts[CSHIFT_POWERUP].destcolor[0] = 255;
-			cl.cshifts[CSHIFT_POWERUP].destcolor[1] = 255;
-			cl.cshifts[CSHIFT_POWERUP].destcolor[2] = 0;
-			cl.cshifts[CSHIFT_POWERUP].percent = 30;
+			if (cl.items & IT_QUAD)
+			{
+				cl.cshifts[CSHIFT_POWERUP].destcolor[0] = 0;
+				cl.cshifts[CSHIFT_POWERUP].destcolor[1] = 0;
+				cl.cshifts[CSHIFT_POWERUP].destcolor[2] = 255;
+				cl.cshifts[CSHIFT_POWERUP].percent = 30;
+			}
+			else if (cl.items & IT_SUIT)
+			{
+				cl.cshifts[CSHIFT_POWERUP].destcolor[0] = 0;
+				cl.cshifts[CSHIFT_POWERUP].destcolor[1] = 255;
+				cl.cshifts[CSHIFT_POWERUP].destcolor[2] = 0;
+				cl.cshifts[CSHIFT_POWERUP].percent = 20;
+			}
+			else if (cl.items & IT_INVISIBILITY)
+			{
+				cl.cshifts[CSHIFT_POWERUP].destcolor[0] = 100;
+				cl.cshifts[CSHIFT_POWERUP].destcolor[1] = 100;
+				cl.cshifts[CSHIFT_POWERUP].destcolor[2] = 100;
+				cl.cshifts[CSHIFT_POWERUP].percent = 100;
+			}
+			else if (cl.items & IT_INVULNERABILITY)
+			{
+				cl.cshifts[CSHIFT_POWERUP].destcolor[0] = 255;
+				cl.cshifts[CSHIFT_POWERUP].destcolor[1] = 255;
+				cl.cshifts[CSHIFT_POWERUP].destcolor[2] = 0;
+				cl.cshifts[CSHIFT_POWERUP].percent = 30;
+			}
+			else
+				cl.cshifts[CSHIFT_POWERUP].percent = 0;
 		}
-		else
-			cl.cshifts[CSHIFT_POWERUP].percent = 0;
+
+		cl.cshifts[CSHIFT_VCSHIFT].destcolor[0] = v_cshift.destcolor[0];
+		cl.cshifts[CSHIFT_VCSHIFT].destcolor[1] = v_cshift.destcolor[1];
+		cl.cshifts[CSHIFT_VCSHIFT].destcolor[2] = v_cshift.destcolor[2];
+		cl.cshifts[CSHIFT_VCSHIFT].percent = v_cshift.percent;
 
 		// LordHavoc: fixed V_CalcBlend
 		for (j = 0;j < NUM_CSHIFTS;j++)
-- 
2.39.2