From: Simon Tatham <anakin@pobox.com>
Date: Fri, 10 Jun 2005 11:27:26 +0000 (+0000)
Subject: Patch from James Harvey to rearrange the Same Game colours.
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;ds=sidebyside;h=98c90052c98b19c43a0a1e4fec8bbed10d7a6d55;p=sgt-puzzles.git

Patch from James Harvey to rearrange the Same Game colours.

[originally from svn r5938]
---

diff --git a/samegame.c b/samegame.c
index f67b7f4..8b4379d 100644
--- a/samegame.c
+++ b/samegame.c
@@ -674,29 +674,29 @@ static float *game_colours(frontend *fe, game_state *state, int *ncolours)
     ret[COL_3 * 3 + 1] = 0.0F;
     ret[COL_3 * 3 + 2] = 0.0F;
 
-    ret[COL_4 * 3 + 0] = 0.5F;
-    ret[COL_4 * 3 + 1] = 0.5F;
-    ret[COL_4 * 3 + 2] = 1.0F;
+    ret[COL_4 * 3 + 0] = 1.0F;
+    ret[COL_4 * 3 + 1] = 1.0F;
+    ret[COL_4 * 3 + 2] = 0.0F;
 
-    ret[COL_5 * 3 + 0] = 0.5F;
-    ret[COL_5 * 3 + 1] = 1.0F;
-    ret[COL_5 * 3 + 2] = 0.5F;
+    ret[COL_5 * 3 + 0] = 1.0F;
+    ret[COL_5 * 3 + 1] = 0.0F;
+    ret[COL_5 * 3 + 2] = 1.0F;
 
-    ret[COL_6 * 3 + 0] = 1.0F;
-    ret[COL_6 * 3 + 1] = 0.5F;
-    ret[COL_6 * 3 + 2] = 0.5F;
+    ret[COL_6 * 3 + 0] = 0.0F;
+    ret[COL_6 * 3 + 1] = 1.0F;
+    ret[COL_6 * 3 + 2] = 1.0F;
 
-    ret[COL_7 * 3 + 0] = 1.0F;
-    ret[COL_7 * 3 + 1] = 1.0F;
-    ret[COL_7 * 3 + 2] = 0.0F;
+    ret[COL_7 * 3 + 0] = 0.5F;
+    ret[COL_7 * 3 + 1] = 0.5F;
+    ret[COL_7 * 3 + 2] = 1.0F;
 
-    ret[COL_8 * 3 + 0] = 1.0F;
-    ret[COL_8 * 3 + 1] = 0.0F;
-    ret[COL_8 * 3 + 2] = 1.0F;
+    ret[COL_8 * 3 + 0] = 0.5F;
+    ret[COL_8 * 3 + 1] = 1.0F;
+    ret[COL_8 * 3 + 2] = 0.5F;
 
-    ret[COL_9 * 3 + 0] = 0.0F;
-    ret[COL_9 * 3 + 1] = 1.0F;
-    ret[COL_9 * 3 + 2] = 1.0F;
+    ret[COL_9 * 3 + 0] = 1.0F;
+    ret[COL_9 * 3 + 1] = 0.5F;
+    ret[COL_9 * 3 + 2] = 0.5F;
 
     ret[COL_IMPOSSIBLE * 3 + 0] = 0.0F;
     ret[COL_IMPOSSIBLE * 3 + 1] = 0.0F;