Strip _color from crosshair*_color_alpha cvars

If there is a good reason to keep the old names just revert this commit

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 929c93994da4580cf7730ba84423cbd14d5b84a4..9b073652d48e6e4b998e6022b755525a27649598 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -91,7 +91,7 @@ seta crosshair 3
 seta crosshair_color_red 0.6
 seta crosshair_color_green 0.8
 seta crosshair_color_blue 1
-seta crosshair_color_alpha 1
+seta crosshair_alpha 1
 seta crosshair_size 0.35
 seta crosshair_dot 1
 seta crosshair_dot_alpha 1
@@ -107,109 +107,109 @@ seta crosshair_laser "" "crosshair to display when wielding the laser"
 seta crosshair_laser_color_red 1       "crosshair color red component to display when wielding the laser"
 seta crosshair_laser_color_green 0.35  "crosshair color green component to display when wielding the laser"
 seta crosshair_laser_color_blue 0.2    "crosshair color blue component to display when wielding the laser"
-seta crosshair_laser_color_alpha 0.75  "crosshair alpha value to display when wielding the laser"
+seta crosshair_laser_alpha 0.75        "crosshair alpha value to display when wielding the laser"
 seta crosshair_laser_size 0.4  "crosshair size when wielding the laser"
 seta crosshair_shotgun ""      "crosshair to display when wielding the shotgun"
 seta crosshair_shotgun_color_red 0.7   "crosshair color red component to display when wielding the shotgun"
 seta crosshair_shotgun_color_green 0.7 "crosshair color green component to display when wielding the shotgun"
 seta crosshair_shotgun_color_blue 0.7  "crosshair color blue component to display when wielding the shotgun"
-seta crosshair_shotgun_color_alpha 1.1 "crosshair alpha value to display when wielding the shotgun"
+seta crosshair_shotgun_alpha 1.1       "crosshair alpha value to display when wielding the shotgun"
 seta crosshair_shotgun_size 0.65       "crosshair size when wielding the shotgun"
 seta crosshair_uzi ""  "crosshair to display when wielding the machinegun"
 seta crosshair_uzi_color_red 0.4       "crosshair color red component to display when wielding the machinegun"
 seta crosshair_uzi_color_green 0.9     "crosshair color green component to display when wielding the machinegun"
 seta crosshair_uzi_color_blue 0.35     "crosshair color blue component to display when wielding the machinegun"
-seta crosshair_uzi_color_alpha 0.9     "crosshair alpha value to display when wielding the machinegun"
+seta crosshair_uzi_alpha 0.9   "crosshair alpha value to display when wielding the machinegun"
 seta crosshair_uzi_size 0.6    "crosshair size when wielding the machinegun"
 seta crosshair_grenadelauncher ""      "crosshair to display when wielding the mortar"
 seta crosshair_grenadelauncher_color_red 1     "crosshair color red component to display when wielding the mortar"
 seta crosshair_grenadelauncher_color_green 0.15        "crosshair color green component to display when wielding the mortar"
 seta crosshair_grenadelauncher_color_blue 0    "crosshair color blue component to display when wielding the mortar"
-seta crosshair_grenadelauncher_color_alpha 1.15        "crosshair alpha value to display when wielding the mortar"
+seta crosshair_grenadelauncher_alpha 1.15      "crosshair alpha value to display when wielding the mortar"
 seta crosshair_grenadelauncher_size 0.7        "crosshair size when wielding the mortar"
 seta crosshair_minelayer ""    "crosshair to display when wielding the mortar"
 seta crosshair_minelayer_color_red 0.75        "crosshair color red component to display when wielding the mortar"
 seta crosshair_minelayer_color_green 0.75      "crosshair color green component to display when wielding the mortar"
 seta crosshair_minelayer_color_blue 0  "crosshair color blue component to display when wielding the mortar"
-seta crosshair_minelayer_color_alpha 1.15      "crosshair alpha value to display when wielding the mortar"
+seta crosshair_minelayer_alpha 1.15    "crosshair alpha value to display when wielding the mortar"
 seta crosshair_minelayer_size 0.9      "crosshair size when wielding the mortar"
 seta crosshair_electro ""      "crosshair to display when wielding the electro"
 seta crosshair_electro_color_red 0.35  "crosshair color red component to display when wielding the electro"
 seta crosshair_electro_color_green 0.5 "crosshair color green component to display when wielding the electro"
 seta crosshair_electro_color_blue 1    "crosshair color blue component to display when wielding the electro"
-seta crosshair_electro_color_alpha 1   "crosshair alpha value to display when wielding the electro"
+seta crosshair_electro_alpha 1 "crosshair alpha value to display when wielding the electro"
 seta crosshair_electro_size 0.5        "crosshair size when wielding the electro"
 seta crosshair_crylink ""      "crosshair to display when wielding the crylink"
 seta crosshair_crylink_color_red 0.85  "crosshair color red component to display when wielding the crylink"
 seta crosshair_crylink_color_green 0.25        "crosshair color green component to display when wielding the crylink"
 seta crosshair_crylink_color_blue 1    "crosshair color blue component to display when wielding the crylink"
-seta crosshair_crylink_color_alpha 0.85        "crosshair alpha value to display when wielding the crylink"
+seta crosshair_crylink_alpha 0.85      "crosshair alpha value to display when wielding the crylink"
 seta crosshair_crylink_size 0.4        "crosshair size when wielding the crylink"
 seta crosshair_nex ""  "crosshair to display when wielding the nex gun"
 seta crosshair_nex_color_red 0 "crosshair color red component to display when wielding the nex gun"
 seta crosshair_nex_color_green 0.9     "crosshair color green component to display when wielding the nex gun"
 seta crosshair_nex_color_blue 1        "crosshair color blue component to display when wielding the nex gun"
-seta crosshair_nex_color_alpha 0.85    "crosshair alpha value to display when wielding the nex gun"
+seta crosshair_nex_alpha 0.85  "crosshair alpha value to display when wielding the nex gun"
 seta crosshair_nex_size 0.65   "crosshair size when wielding the nex gun"
 seta crosshair_hagar ""        "crosshair to display when wielding the hagar"
 seta crosshair_hagar_color_red 0.85    "crosshair color red component to display when wielding the hagar"
 seta crosshair_hagar_color_green 0.5   "crosshair color green component to display when wielding the hagar"
 seta crosshair_hagar_color_blue 0.35   "crosshair color blue component to display when wielding the hagar"
-seta crosshair_hagar_color_alpha 1     "crosshair alpha value to display when wielding the hagar"
+seta crosshair_hagar_alpha 1   "crosshair alpha value to display when wielding the hagar"
 seta crosshair_hagar_size 0.8  "crosshair size when wielding the hagar"
 seta crosshair_rocketlauncher ""       "crosshair to display when wielding the rocketlauncher"
 seta crosshair_rocketlauncher_color_red 1      "crosshair color red component to display when wielding the rocketlauncher"
 seta crosshair_rocketlauncher_color_green 0.75 "crosshair color green component to display when wielding the rocketlauncher"
 seta crosshair_rocketlauncher_color_blue 0.2   "crosshair color blue component to display when wielding the rocketlauncher"
-seta crosshair_rocketlauncher_color_alpha 1    "crosshair alpha value to display when wielding the rocketlauncher"
+seta crosshair_rocketlauncher_alpha 1  "crosshair alpha value to display when wielding the rocketlauncher"
 seta crosshair_rocketlauncher_size 0.5875      "crosshair size when wielding the rocketlauncher"
 seta crosshair_porto ""        "crosshair to display when wielding the porto"
 seta crosshair_porto_color_red 0.5     "crosshair color red component to display when wielding the porto"
 seta crosshair_porto_color_green 1     "crosshair color green component to display when wielding the porto"
 seta crosshair_porto_color_blue 0.5    "crosshair color blue component to display when wielding the porto"
-seta crosshair_porto_color_alpha 0.85  "crosshair alpha value to display when wielding the porto"
+seta crosshair_porto_alpha 0.85        "crosshair alpha value to display when wielding the porto"
 seta crosshair_porto_size 0.6  "crosshair size when wielding the porto"
 seta crosshair_minstanex ""    "crosshair to display when wielding the minstanex gun"
 seta crosshair_minstanex_color_red 0.65        "crosshair color red component to display when wielding the minstanex gun"
 seta crosshair_minstanex_color_green 0.65      "crosshair color green component to display when wielding the minstanex gun"
 seta crosshair_minstanex_color_blue 1  "crosshair color blue component to display when wielding the minstanex gun"
-seta crosshair_minstanex_color_alpha 1 "crosshair alpha value to display when wielding the minstanex gun"
+seta crosshair_minstanex_alpha 1       "crosshair alpha value to display when wielding the minstanex gun"
 seta crosshair_minstanex_size 0.4      "crosshair size when wielding the minstanex gun"
 seta crosshair_hook "" "crosshair to display when wielding the hook"
 seta crosshair_hook_color_red 0.65     "crosshair color red component to display when wielding the hook"
 seta crosshair_hook_color_green 1      "crosshair color green component to display when wielding the hook"
 seta crosshair_hook_color_blue 0.85    "crosshair color blue component to display when wielding the hook"
-seta crosshair_hook_color_alpha 0.85   "crosshair alpha value to display when wielding the hook"
+seta crosshair_hook_alpha 0.85 "crosshair alpha value to display when wielding the hook"
 seta crosshair_hook_size 0.5   "crosshair size when wielding the hook"
 seta crosshair_hlac "" "crosshair to display when wielding the H.L.A.C"
 seta crosshair_hlac_color_red 1        "crosshair color red component to display when wielding the H.L.A.C."
 seta crosshair_hlac_color_green 0.65   "crosshair color green component to display when wielding the H.L.A.C."
 seta crosshair_hlac_color_blue 0.2     "crosshair color blue component to display when wielding the H.L.A.C."
-seta crosshair_hlac_color_alpha 1      "crosshair alpha value to display when wielding the H.L.A.C."
+seta crosshair_hlac_alpha 1    "crosshair alpha value to display when wielding the H.L.A.C."
 seta crosshair_hlac_size 0.6   "crosshair size when wielding the H.L.A.C."
 seta crosshair_seeker ""       "crosshair to display when wielding the TAG Seeker"
 seta crosshair_seeker_color_red 1      "crosshair color red component to display when wielding the TAG seeker"
 seta crosshair_seeker_color_green 0.35 "crosshair color green component to display when wielding the TAG seeker"
 seta crosshair_seeker_color_blue 0.35  "crosshair color blue component to display when wielding the TAG seeker"
-seta crosshair_seeker_color_alpha 0.9  "crosshair alpha value to display when wielding the TAG seeker"
+seta crosshair_seeker_alpha 0.9        "crosshair alpha value to display when wielding the TAG seeker"
 seta crosshair_seeker_size 0.8 "crosshair size when wielding the TAG seeker"
 seta crosshair_campingrifle "" "crosshair to display when wielding the campingrifle"
 seta crosshair_campingrifle_color_red 0.85     "crosshair color red component to display when wielding the campingrifle"
 seta crosshair_campingrifle_color_green 0.5    "crosshair color green component to display when wielding the campingrifle"
 seta crosshair_campingrifle_color_blue 0.25    "crosshair color blue component to display when wielding the campingrifle"
-seta crosshair_campingrifle_color_alpha 1      "crosshair alpha value to display when wielding the campingrifle"
+seta crosshair_campingrifle_alpha 1    "crosshair alpha value to display when wielding the campingrifle"
 seta crosshair_campingrifle_size 0.65  "crosshair size when wielding the campingrifle"
 seta crosshair_tuba "" "crosshair to display when wielding the tuba"
 seta crosshair_tuba_color_red 0.85     "crosshair color red component to display when wielding the tuba"
 seta crosshair_tuba_color_green 0.5    "crosshair color green component to display when wielding the tuba"
 seta crosshair_tuba_color_blue 0.25    "crosshair color blue component to display when wielding the tuba"
-seta crosshair_tuba_color_alpha 1      "crosshair alpha value to display when wielding the tuba"
+seta crosshair_tuba_alpha 1    "crosshair alpha value to display when wielding the tuba"
 seta crosshair_tuba_size 1     "crosshair size when wielding the tuba"
 seta crosshair_fireball ""     "crosshair to display when wielding the fireball"
 seta crosshair_fireball_color_red 0.2  "crosshair color red component to display when wielding the fireball"
 seta crosshair_fireball_color_green 1.0        "crosshair color green component to display when wielding the fireball"
 seta crosshair_fireball_color_blue 0.2 "crosshair color blue component to display when wielding the fireball"
-seta crosshair_fireball_color_alpha 1  "crosshair alpha value to display when wielding the fireball"
+seta crosshair_fireball_alpha 1        "crosshair alpha value to display when wielding the fireball"
 seta crosshair_fireball_size 1 "crosshair size when wielding the fireball"
 seta crosshair_ring_size 2     "bullet counter ring size for Rifle, velocity ring for Nex"
 seta crosshair_campingrifle_bulletcounter_alpha 0.15

diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc
index 79a3b760b5f1c74783cf87cd6a74d14e52c7035e..00c395893c596f4d142d0db66d70f4a4241faebf 100644 (file)
--- a/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@ -706,7 +706,7 @@ void CSQC_UpdateView(float w, float h)
                        wcross_resolution = cvar("crosshair_size");
                        if (wcross_resolution == 0)
                                return;
-                       wcross_alpha = cvar("crosshair_color_alpha");
+                       wcross_alpha = cvar("crosshair_alpha");
                        if (wcross_alpha == 0)
                                return;
 
@@ -750,7 +750,7 @@ void CSQC_UpdateView(float w, float h)
                                        wcross_resolution *= cvar(strcat("crosshair_", wcross_wep, "_size"));
                                        if (wcross_resolution == 0)
                                                return;
-                                       wcross_alpha *= cvar(strcat("crosshair_", wcross_wep, "_color_alpha"));
+                                       wcross_alpha *= cvar(strcat("crosshair_", wcross_wep, "_alpha"));
                                        if (wcross_alpha == 0)
                                                return;
 

diff --git a/qcsrc/menu/xonotic/crosshairbutton.c b/qcsrc/menu/xonotic/crosshairbutton.c
index 058bfd7eb16638eb4722631ce48d2f022685050d..645b9320750fcedced0f2c6b7f0ec5947a7af888 100644 (file)
--- a/qcsrc/menu/xonotic/crosshairbutton.c
+++ b/qcsrc/menu/xonotic/crosshairbutton.c
@@ -66,7 +66,7 @@ void XonoticCrosshairButton_draw(entity me)
        float a;
 
        rgb = eX * cvar("crosshair_color_red") + eY * cvar("crosshair_color_green") + eZ * cvar("crosshair_color_blue");
-       a = cvar("crosshair_color_alpha");
+       a = cvar("crosshair_alpha");
 
        if(!me.checked && !me.focused)
        {

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c
index 751c5559180c592e5ac2b350dea2ad1b00afb0d6..354c1857e2c0b133c51ffbd912df3b2f4b0a13d7 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c
@@ -131,7 +131,7 @@ void XonoticPlayerSettingsTab_fill(entity me)
        me.TR(me);
                me.TDempty(me, 0.2);
                me.TD(me, 1, 1, e = makeXonoticTextLabel(0, "Crosshair alpha:"));
-               me.TD(me, 1, 1.8, e = makeXonoticSlider(0, 1, 0.1, "crosshair_color_alpha"));
+               me.TD(me, 1, 1.8, e = makeXonoticSlider(0, 1, 0.1, "crosshair_alpha"));
        me.TR(me);
                me.TDempty(me, 0.2);
                me.TD(me, 1, 1, e = makeXonoticTextLabel(0, "Crosshair red:"));