Fix a big issue I forgot with the color picker

diff --git a/data/qcsrc/menu/voret/colorpicker.c b/data/qcsrc/menu/voret/colorpicker.c
index c3963db050ee244e63833cb1e1ac5d9d6b0ec436..81e77d1e9e4fdce911da1e8017a4d9b5696655c4 100644 (file)
--- a/data/qcsrc/menu/voret/colorpicker.c
+++ b/data/qcsrc/menu/voret/colorpicker.c
@@ -51,6 +51,25 @@ vector hslimage_color(vector v, vector margin)
         return hsl_to_rgb(v_x * 6 * eX + eY + v_y / 0.875 * eZ);\r
 }\r
 \r
+vector color_hslimage(vector v, vector margin)\r
+{\r
+       vector pos;\r
+       v = rgb_to_hsl(v);\r
+       if (v_y)\r
+       {\r
+               pos_x = v_x / 6;\r
+               pos_y = v_z * 0.875;\r
+       }\r
+       else // grey scale\r
+       {\r
+               pos_x = v_z;\r
+               pos_y = 0.875 + 0.07;\r
+       }\r
+       pos_x = margin_x + pos_x * (1 - 2 * margin_x);\r
+       pos_y = margin_y + pos_y * (1 - 2 * margin_y);\r
+       return pos;\r
+}\r
+\r
 float mouseDragVoretColorpicker(entity me, vector coords)\r
 {\r
        float i;\r

diff --git a/data/qcsrc/menu/voret/colorpicker_string.c b/data/qcsrc/menu/voret/colorpicker_string.c
index b6c3d2313215c500f891e457875255308a30c95b..ee9c9495f4bb12b664eb825b7e9306635b35e9d4 100644 (file)
--- a/data/qcsrc/menu/voret/colorpicker_string.c
+++ b/data/qcsrc/menu/voret/colorpicker_string.c
@@ -29,9 +29,9 @@ void configureVoretColorpickerStringVoretColorpickerString(entity me, string the
        me.cvarName = theCvar;
        me.configureImage(me, me.image);
        if(cvar_string(theCvar) != "")
-               me.prevcoords = hslimage_color(stov(cvar_string(theCvar)), me.imagemargin);
+               me.prevcoords = color_hslimage(stov(cvar_string(theCvar)), me.imagemargin);
        else // use default
-               me.prevcoords = hslimage_color(stov(cvar_string(theDefaultCvar)), me.imagemargin);
+               me.prevcoords = color_hslimage(stov(cvar_string(theDefaultCvar)), me.imagemargin);
 }
 
 float mousePressVoretColorpickerString(entity me, vector coords)