make an awesome crosshair default ;)

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index ee2219bbcf06e1b7a9b08f7816e776c8e4a5ad6c..bf1d943dae64243d9463df29199f76f9a49d897e 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -89,14 +89,14 @@ _cl_color 102
 _cl_name Player
 _cl_playermodel models/player/umbra.iqm
 _cl_playerskin 0
 _cl_name Player
 _cl_playermodel models/player/umbra.iqm
 _cl_playerskin 0

-seta crosshair 3
+seta crosshair 16

 seta crosshair_color "0.6 0.8 1"
 seta crosshair_color "0.6 0.8 1"

-seta crosshair_alpha 1
-seta crosshair_size 0.35
+seta crosshair_alpha 0.3
+seta crosshair_size 0.5

 seta crosshair_dot 1
 seta crosshair_dot_alpha 1
 seta crosshair_dot 1
 seta crosshair_dot_alpha 1

-seta crosshair_dot_size 1
-seta crosshair_dot_color 0 "when != 0, use custom color for the crosshair dot"
+seta crosshair_dot_size 0.6
+seta crosshair_dot_color "1 0 0" "when != 0, use custom color for the crosshair dot"

 seta crosshair_pickup 0.25
 seta crosshair_pickup_speed 4
 seta crosshair_per_weapon 0    "when 1, each gun will display a different crosshair"
 seta crosshair_pickup 0.25
 seta crosshair_pickup_speed 4
 seta crosshair_per_weapon 0    "when 1, each gun will display a different crosshair"

diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc
index a3fa9c2162c43ff06ac53e86bc76e6b586a2ddd0..714b5d3339fb46dc2a2e8b892aab8b9d7b717bf4 100644 (file)
--- a/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@ -1006,7 +1006,7 @@ void CSQC_UpdateView(float w, float h)
                 wcross_color_old = wcross_color;
                 if(cvar_string("crosshair_dot_color") != "0")
                     wcross_color = stov(cvar_string("crosshair_dot_color"));
                 wcross_color_old = wcross_color;
                 if(cvar_string("crosshair_dot_color") != "0")
                     wcross_color = stov(cvar_string("crosshair_dot_color"));

-                               CROSSHAIR_DRAW(wcross_resolution * cvar("crosshair_dot_size"), "gfx/crosshairdot.tga", wcross_alpha * f * cvar("crosshair_dot_alpha"));
+                               CROSSHAIR_DRAW(wcross_resolution * cvar("crosshair_dot_size"), "gfx/crosshairdot.tga", f * cvar("crosshair_dot_alpha"));

                 wcross_color = wcross_color_old;
             }
 
                 wcross_color = wcross_color_old;
             }