From: Rudolf Polzer <divverent@alientrap.org>
Date: Tue, 3 Jan 2012 14:20:42 +0000 (+0100)
Subject: put the colors in rainbow order on the menu
X-Git-Tag: xonotic-v0.6.0~189^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=178ff309c238ee4763b86fb5a7790e2cb108a845;p=xonotic%2Fxonotic-data.pk3dir.git

put the colors in rainbow order on the menu
---

diff --git a/gfx/colormap_palette.pl b/gfx/colormap_palette.pl
index cdd38ed95..07ad2de11 100644
--- a/gfx/colormap_palette.pl
+++ b/gfx/colormap_palette.pl
@@ -23,15 +23,15 @@ my @colors = (
 	'00ff80', # cyangreen
 	'00ff00', # green
 	'ff0000', # red
-	'00aaff', # cyanblue2
+	'00aaff', # cyanblue1
 	'00ffff', # cyan
 	'80ff00', # yellowgreen
-	'8000ff', # redmagenta
+	'8000ff', # bluemagenta
 	'ff00ff', # magenta
-	'ff0080', # bluemagenta
+	'ff0080', # redmagenta
 	'0000ff', # blue
 	'ffff00', # yellow
-	'0055ff', # cyanblue1
+	'0055ff', # cyanblue2
 	'ffaa00', # orange2
 	'000000' # unused
 );
diff --git a/qcsrc/menu/xonotic/colorbutton.c b/qcsrc/menu/xonotic/colorbutton.c
index 2ca8c86c4..4e81a4acc 100644
--- a/qcsrc/menu/xonotic/colorbutton.c
+++ b/qcsrc/menu/xonotic/colorbutton.c
@@ -28,6 +28,27 @@ entity makeXonoticColorButton(float theGroup, float theColor, float theValue)
 }
 void XonoticColorButton_configureXonoticColorButton(entity me, float theGroup, float theColor, float theValue)
 {
+	switch(theValue)
+	{
+		// rearrange 1..14 for rainbow order
+		case  1: theValue = 10; break;
+		case  2: theValue =  4; break;
+		case  3: theValue =  1; break;
+		case  4: theValue = 14; break;
+		case  5: theValue = 12; break;
+		case  6: theValue =  7; break;
+		case  7: theValue =  3; break;
+		case  8: theValue =  2; break;
+		case  9: theValue =  6; break;
+		case 10: theValue =  5; break;
+		case 11: theValue = 13; break;
+		case 12: theValue = 11; break;
+		case 13: theValue =  8; break;
+		case 14: theValue =  9; break;
+		default:
+			// no change
+			break;
+	}
 	me.cvarName = "_cl_color";
 	me.cvarValueFloat = theValue;
 	me.cvarPart = theColor;