zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-27 22:33:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed: Players using colorsets instead of custom colors overrode their team colors.

Browse source 
SVN r4169 (trunk)
This commit is contained in:
Randy Heit 2013-02-27 03:27:33 +00:00
parent b93dfcf3cf
commit ce39368796
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/d_netinfo.cpp
View file

@ -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); *s = clamp(ts + *s * 0.15f - 0.075f, 0.f, 1.f);
*v = clamp(tv + *v * 0.5f - 0.25f, 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) if (set != NULL)
{ {