* Updated to ZDoom 4170:

- Moved all BorderNeedRefresh and SB_state updating code into separate functions that won't crash if screen is NULL.
- Fixed: G_DoLoadLevel() has a for loop where it resets player cameras that incremented and checked the wrong variable.
- Fixed: Players using colorsets instead of custom colors overrode their team colors.
- Added TheFortuneTeller's NORANDOMPUFFZ submission.

git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@1534 b0f79afe-0144-0410-b225-9a4edf0717df

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)
 	{