From b4f3b57aa101d679a07e3c654fd4eded57eb755e Mon Sep 17 00:00:00 2001 From: Simon Tatham Date: Sun, 8 Apr 2012 13:06:46 +0000 Subject: [PATCH] Swap a 'max' for a 'min', fixing an out-of-range colour component being passed to the front end. [originally from svn r9451] --- galaxies.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/galaxies.c b/galaxies.c index d8906b6..b9eb603 100644 --- a/galaxies.c +++ b/galaxies.c @@ -2977,10 +2977,10 @@ static float *game_colours(frontend *fe, int *ncolours) /* tinge the edit background to bluey */ ret[COL_BACKGROUND * 3 + 0] = ret[COL_BACKGROUND * 3 + 0] * 0.8F; ret[COL_BACKGROUND * 3 + 1] = ret[COL_BACKGROUND * 3 + 0] * 0.8F; - ret[COL_BACKGROUND * 3 + 2] = max(ret[COL_BACKGROUND * 3 + 0] * 1.4F, 1.0F); + ret[COL_BACKGROUND * 3 + 2] = min(ret[COL_BACKGROUND * 3 + 0] * 1.4F, 1.0F); #endif - ret[COL_CURSOR * 3 + 0] = max(ret[COL_BACKGROUND * 3 + 0] * 1.4F, 1.0F); + ret[COL_CURSOR * 3 + 0] = min(ret[COL_BACKGROUND * 3 + 0] * 1.4F, 1.0F); ret[COL_CURSOR * 3 + 1] = ret[COL_BACKGROUND * 3 + 0] * 0.8F; ret[COL_CURSOR * 3 + 2] = ret[COL_BACKGROUND * 3 + 0] * 0.8F; -- 2.30.2