Cvar whether or not we want reticles to fit the screen at the price of stretching...

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 9d5c902e3325985c2e7d1d49c6da1fd4e41461e2..526a57d448bf5157c75b0b04e31264a49184fdcf 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -206,8 +206,9 @@ seta crosshair_fireball_color_green 1.0     "crosshair color green component to disp
 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_size 1 "crosshair size when wielding the fireball"
-seta cl_reticle_nex 1 "draw aiming recticle for the nex weapon's zoom, 0 disables and values between 0 and 1 change alpha"
-seta cl_reticle_normal 1 "draw recticle when zooming with the zoom button, 0 disables and values between 0 and 1 change alpha"
+seta cl_reticle_stretch 0 "whether to stretch reticles so they fit the screen (brakes image proportions)"
+seta cl_reticle_item_nex 1 "draw aiming recticle for the nex weapon's zoom, 0 disables and values between 0 and 1 change alpha"
+seta cl_reticle_item_normal 1 "draw recticle when zooming with the zoom button, 0 disables and values between 0 and 1 change alpha"
 fov 90
 seta cl_velocityzoom 0 "velocity based zooming of fov, negative values zoom out"
 seta cl_velocityzoomtime 0.3   "time value for averaging speed values"

diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc
index ff2596762615860ecc7217a9b7228a83f72adde1..18ec9659813b27f2a8fc40484ec31a330849b0e3 100644 (file)
--- a/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@ -563,22 +563,32 @@ void CSQC_UpdateView(float w, float h)
        else if(activeweapon == WEP_NEX && button_attack2)
                reticle_type = 2; // nex zoom
 
-       reticle_size_x = max(vid_conwidth, vid_conheight);
-       reticle_size_y = max(vid_conwidth, vid_conheight);
-       reticle_pos_x = (vid_conwidth - reticle_size_x) / 2;
-       reticle_pos_y = (vid_conheight - reticle_size_y) / 2;
+       if(cvar("cl_reticle_stretch"))
+       {
+               reticle_pos_x = 0;
+               reticle_pos_y = 0;
+               reticle_size_x = vid_conwidth;
+               reticle_size_y = vid_conheight;
+       }
+       else
+       {
+               reticle_size_x = max(vid_conwidth, vid_conheight);
+               reticle_size_y = max(vid_conwidth, vid_conheight);
+               reticle_pos_x = (vid_conwidth - reticle_size_x) / 2;
+               reticle_pos_y = (vid_conheight - reticle_size_y) / 2;
+       }
 
-       if(cvar("cl_reticle_normal"))
+       if(cvar("cl_reticle_item_normal"))
        {
                precache_pic("textures/reticle_normal");
                if(reticle_type == 1 && current_zoomfraction)
-                       drawpic(reticle_pos, "textures/reticle_normal", reticle_size, '1 1 1', current_zoomfraction * cvar("cl_reticle_normal"), DRAWFLAG_NORMAL);
+                       drawpic(reticle_pos, "textures/reticle_normal", reticle_size, '1 1 1', current_zoomfraction * cvar("cl_reticle_item_normal"), DRAWFLAG_NORMAL);
        }
-       if(cvar("cl_reticle_nex"))
+       if(cvar("cl_reticle_item_nex"))
        {
                precache_pic("textures/reticle_nex");
                if(reticle_type == 2 && current_zoomfraction)
-                       drawpic(reticle_pos, "textures/reticle_nex", reticle_size, '1 1 1', current_zoomfraction * cvar("cl_reticle_nex"), DRAWFLAG_NORMAL);
+                       drawpic(reticle_pos, "textures/reticle_nex", reticle_size, '1 1 1', current_zoomfraction * cvar("cl_reticle_item_nex"), DRAWFLAG_NORMAL);
        }
 
        // Draw the mouse cursor