Allow custom color and alpha values for the crosshair picker (like it is for the...

diff --git a/gfx/menu/luma/skinvalues.txt b/gfx/menu/luma/skinvalues.txt
index d521800a0f36ab479a707b0eba32b17dae14a005..5a36d90e0722e389e135f6057c931b150dc673da 100644 (file)
--- a/gfx/menu/luma/skinvalues.txt
+++ b/gfx/menu/luma/skinvalues.txt
@@ -34,6 +34,10 @@ COLOR_CAMPAIGN_SELECTABLE     '0.96 0.99 1'
 ALPHA_CHARMAP_CHAR            0.85
 COLOR_CHARMAP_CHAR            '1 1 1'
 
+// crosshairpicker
+ALPHA_CROSSHAIRPICKER_CROSSHAIR 0.85
+COLOR_CROSSHAIRPICKER_CROSSHAIR '1 1 1'
+
 // checkbox
 COLOR_CHECKBOX_C              '1 1 1'
 COLOR_CHECKBOX_D              '1 1 1'

diff --git a/gfx/menu/luminos/skinvalues.txt b/gfx/menu/luminos/skinvalues.txt
index cce525534d5fabc61ada2b8052fcb5377c257866..b9c69802e490e28ecc7b6b6cbebf24e3eb479204 100755 (executable)
--- a/gfx/menu/luminos/skinvalues.txt
+++ b/gfx/menu/luminos/skinvalues.txt
@@ -222,6 +222,10 @@ ALPHA_KEYGRABBER_KEYS           0.7
 ALPHA_CHARMAP_CHAR              0.85
 COLOR_CHARMAP_CHAR              '1 1 1'
 
+// item: crosshairpicker
+ALPHA_CROSSHAIRPICKER_CROSSHAIR 0.85
+COLOR_CROSSHAIRPICKER_CROSSHAIR '1 1 1'
+
 // item: radio button
 //   uses "radiobutton" images
 COLOR_RADIOBUTTON_N             '1 1 1'

diff --git a/gfx/menu/wickedx/skinvalues.txt b/gfx/menu/wickedx/skinvalues.txt
index 6eecd78cc0ac6272fdae99d952ddc42b4a453295..09ded4b087c356d741a823ab25293da71bae7dcb 100644 (file)
--- a/gfx/menu/wickedx/skinvalues.txt
+++ b/gfx/menu/wickedx/skinvalues.txt
@@ -222,6 +222,10 @@ ALPHA_KEYGRABBER_KEYS           0.7
 ALPHA_CHARMAP_CHAR              0.85
 COLOR_CHARMAP_CHAR              '1 1 1'
 
+// item: crosshairpicker
+ALPHA_CROSSHAIRPICKER_CROSSHAIR 0.85
+COLOR_CROSSHAIRPICKER_CROSSHAIR '1 1 1'
+
 // item: radio button
 //   uses "radiobutton" images
 COLOR_RADIOBUTTON_N             '1 1 1'

diff --git a/gfx/menu/xaw/skinvalues.txt b/gfx/menu/xaw/skinvalues.txt
index bb6b78d16bd67dc80c10d8083e62fcda43623967..00df32498ebdfdb623c9e42d3c9c0348db648a94 100644 (file)
--- a/gfx/menu/xaw/skinvalues.txt
+++ b/gfx/menu/xaw/skinvalues.txt
@@ -177,6 +177,10 @@ ALPHA_MODELTITLE                1
 ALPHA_CHARMAP_CHAR              0.85
 COLOR_CHARMAP_CHAR              '1 1 1'
 
+// item: crosshairpicker
+ALPHA_CROSSHAIRPICKER_CROSSHAIR 0.85
+COLOR_CROSSHAIRPICKER_CROSSHAIR '1 1 1'
+
 // item: radio button
 //   uses "radiobutton" images
 COLOR_RADIOBUTTON_N             '1 1 1'

diff --git a/qcsrc/menu/xonotic/crosshairpicker.qc b/qcsrc/menu/xonotic/crosshairpicker.qc
index 1441ebcb31eb18ef6d43edd9cedd12fbbbf82dc4..2f2c35507823fe090c1ec014fe3056376b494c40 100644 (file)
--- a/qcsrc/menu/xonotic/crosshairpicker.qc
+++ b/qcsrc/menu/xonotic/crosshairpicker.qc
@@ -58,7 +58,7 @@ bool XonoticCrosshairPicker_cellIsValid(entity me, vector cell)
 
 void XonoticCrosshairPicker_cellDraw(entity me, vector cell, vector cellPos)
 {
-       vector sz, rgb;
+       vector sz;
        string cross = strcat("/gfx/crosshair", crosshairpicker_cellToCrosshair(me, cell));
        sz = draw_PictureSize(cross);
        sz = globalToBoxSize(sz, me.size);
@@ -68,12 +68,10 @@ void XonoticCrosshairPicker_cellDraw(entity me, vector cell, vector cellPos)
        sz.y = sz.x / ar;
        sz = sz * 0.95;
 
-       rgb = '1 1 1';
-
        vector crosshairPos = cellPos + 0.5 * me.realCellSize;
-       draw_Picture(crosshairPos - 0.5 * sz, cross, sz, rgb, me.alpha);
+       draw_Picture(crosshairPos - 0.5 * sz, cross, sz, SKINCOLOR_CROSSHAIRPICKER_CROSSHAIR, SKINALPHA_CROSSHAIRPICKER_CROSSHAIR);
 
        if(cvar("crosshair_dot"))
-               draw_Picture(crosshairPos - 0.5 * sz * cvar("crosshair_dot_size"), "/gfx/crosshairdot", sz * cvar("crosshair_dot_size"), rgb, me.alpha);
+               draw_Picture(crosshairPos - 0.5 * sz * cvar("crosshair_dot_size"), "/gfx/crosshairdot", sz * cvar("crosshair_dot_size"), SKINCOLOR_CROSSHAIRPICKER_CROSSHAIR, SKINALPHA_CROSSHAIRPICKER_CROSSHAIR);
 }
 #endif