From: divverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Sun, 7 Dec 2008 18:23:15 +0000 (+0000)
Subject: better handling of color tints by colormap
X-Git-Tag: xonotic-v0.1.0preview~2011
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=commitdiff_plain;h=512be58e753f9d71c315c75cb353297c1da0a2c9

better handling of color tints by colormap


git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@8579 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/gl_rmain.c b/gl_rmain.c
index 91d8dd63..4797e405 100644
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -6458,9 +6458,9 @@ static void R_DrawTextureSurfaceList_ShowSurfaces3(int texturenumsurfaces, msurf
 
 	if (rsurface.texture->currentskinframe->pants || rsurface.texture->currentskinframe->shirt)
 	{
-		c[0] = rsurface.colormap_pantscolor[0] * 0.2 + rsurface.colormap_shirtcolor[0] * 0.3;
-		c[1] = rsurface.colormap_pantscolor[1] * 0.2 + rsurface.colormap_shirtcolor[1] * 0.3;
-		c[2] = rsurface.colormap_pantscolor[2] * 0.2 + rsurface.colormap_shirtcolor[2] * 0.3;
+		c[0] = (rsurface.colormap_pantscolor[0] * 0.2 + rsurface.colormap_shirtcolor[0] * 0.3) * (c[0] + 1);
+		c[1] = (rsurface.colormap_pantscolor[1] * 0.2 + rsurface.colormap_shirtcolor[1] * 0.3) * (c[1] + 1);
+		c[2] = (rsurface.colormap_pantscolor[2] * 0.2 + rsurface.colormap_shirtcolor[2] * 0.3) * (c[2] + 1);
 	}
 
 	// brighten it up (as texture value 127 means "unlit")