From: divverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Thu, 20 Mar 2008 10:42:12 +0000 (+0000)
Subject: damn, I accidentally committed this with the last fix... now that it HAS happened... 
X-Git-Tag: xonotic-v0.1.0preview~2309
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=92ec62338a73cbf6f89229095bcd02cf5e93eca4;p=xonotic%2Fdarkplaces.git

damn, I accidentally committed this with the last fix... now that it HAS happened, at least if(... == GAME_NEXUIZ) it


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

diff --git a/cl_screen.c b/cl_screen.c
index 48fb0413..f5e72b21 100644
--- a/cl_screen.c
+++ b/cl_screen.c
@@ -2110,15 +2110,18 @@ void CL_UpdateScreen(void)
 	double rendertime1;
 	float conwidth, conheight;
 
-	// play a bit with the palette
-	palette_rgb_pantscolormap[15][0] = 128 + 127 * sin(cl.time / exp(1) + 0*M_PI/3);
-	palette_rgb_pantscolormap[15][1] = 128 + 127 * sin(cl.time / exp(1) + 2*M_PI/3);
-	palette_rgb_pantscolormap[15][2] = 128 + 127 * sin(cl.time / exp(1) + 4*M_PI/3);
-	palette_rgb_shirtcolormap[15][0] = 128 + 127 * sin(cl.time /  M_PI  + 5*M_PI/3);
-	palette_rgb_shirtcolormap[15][1] = 128 + 127 * sin(cl.time /  M_PI  + 3*M_PI/3);
-	palette_rgb_shirtcolormap[15][2] = 128 + 127 * sin(cl.time /  M_PI  + 1*M_PI/3);
-	memcpy(palette_rgb_pantsscoreboard[15], palette_rgb_pantscolormap[15], sizeof(*palette_rgb_pantscolormap));
-	memcpy(palette_rgb_shirtscoreboard[15], palette_rgb_shirtcolormap[15], sizeof(*palette_rgb_shirtcolormap));
+	if(gamemode == GAME_NEXUIZ)
+	{
+		// play a bit with the palette (experimental)
+		palette_rgb_pantscolormap[15][0] = 128 + 127 * sin(cl.time / exp(1) + 0*M_PI/3);
+		palette_rgb_pantscolormap[15][1] = 128 + 127 * sin(cl.time / exp(1) + 2*M_PI/3);
+		palette_rgb_pantscolormap[15][2] = 128 + 127 * sin(cl.time / exp(1) + 4*M_PI/3);
+		palette_rgb_shirtcolormap[15][0] = 128 + 127 * sin(cl.time /  M_PI  + 5*M_PI/3);
+		palette_rgb_shirtcolormap[15][1] = 128 + 127 * sin(cl.time /  M_PI  + 3*M_PI/3);
+		palette_rgb_shirtcolormap[15][2] = 128 + 127 * sin(cl.time /  M_PI  + 1*M_PI/3);
+		memcpy(palette_rgb_pantsscoreboard[15], palette_rgb_pantscolormap[15], sizeof(*palette_rgb_pantscolormap));
+		memcpy(palette_rgb_shirtscoreboard[15], palette_rgb_shirtcolormap[15], sizeof(*palette_rgb_shirtcolormap));
+	}
 
 	if (vid_hidden || !scr_refresh.integer)
 		return;