From ce393687963b191b19db0e7080f4fb602c971211 Mon Sep 17 00:00:00 2001
From: Randy Heit <rheit@zdoom.fake>
Date: Wed, 27 Feb 2013 03:27:33 +0000
Subject: [PATCH] - Fixed: Players using colorsets instead of custom colors
 overrode their team colors.

SVN r4169 (trunk)
---
 src/d_netinfo.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/d_netinfo.cpp b/src/d_netinfo.cpp
index ed6a4f7fc..ef8984931 100644
--- a/src/d_netinfo.cpp
+++ b/src/d_netinfo.cpp
@@ -223,6 +223,9 @@ void D_GetPlayerColor (int player, float *h, float *s, float *v, FPlayerColorSet
 
 		*s = clamp(ts + *s * 0.15f - 0.075f, 0.f, 1.f);
 		*v = clamp(tv + *v * 0.5f - 0.25f, 0.f, 1.f);
+
+		// Make sure not to pass back any colorset in teamplay.
+		colorset = NULL;
 	}
 	if (set != NULL)
 	{