From: divverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Sun, 7 Dec 2008 18:28:33 +0000 (+0000)
Subject: no, this way of colormapping looks best after all... sorry
X-Git-Tag: xonotic-v0.1.0preview~2010
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=31039e41f838ccab35bbd8857ed3cedd7a9efb6d;p=xonotic%2Fdarkplaces.git

no, this way of colormapping looks best after all... sorry


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

diff --git a/gl_rmain.c b/gl_rmain.c
index 4797e405..03beaffe 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[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);
+		c[0] = (rsurface.colormap_pantscolor[0] * 0.3 + rsurface.colormap_shirtcolor[0] * 0.7);
+		c[1] = (rsurface.colormap_pantscolor[1] * 0.3 + rsurface.colormap_shirtcolor[1] * 0.7);
+		c[2] = (rsurface.colormap_pantscolor[2] * 0.3 + rsurface.colormap_shirtcolor[2] * 0.7);
 	}
 
 	// brighten it up (as texture value 127 means "unlit")