Make the reticle fade in based on zoom speed. Fix some silly typos as well. Imo this...

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / View.qc

diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc
index 2c898bbcbb5470a5ffbd5ee39cd5d62384b60f8a..86e96d2f54807480563d0ddda5f17c19504dd128 100644 (file)
--- a/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@ -291,6 +291,10 @@ float TrueAimCheck()
                        mi = '-16 -16 -16';
                        ma = '16 16 16';
                        break;
+               case WEP_SEEKER: // projectile has a size!
+                       mi = '-2 -2 -2';
+                       ma = '2 2 2';
+                       break;
                case WEP_ELECTRO: // projectile has a size!
                        mi = '0 0 -3';
                        ma = '0 0 -3';
@@ -352,6 +356,8 @@ void CSQC_UpdateView(float w, float h)
        float f, i, j;
        vector v, vo;
 
+       vector reticle_pos, reticle_size;
+
        WaypointSprite_Load();
 
        if(spectatee_status)
@@ -573,6 +579,16 @@ void CSQC_UpdateView(float w, float h)
                        self.draw2d();
        self = e;
 
+       // draw the aiming reticle for weapons that use it (eg. Nex)
+       reticle_pos_x = 0;
+       reticle_pos_y = 0;
+       reticle_size_x = vid_conwidth;
+       reticle_size_y = vid_conheight;
+
+       if(cvar("cl_reticle_nex"))
+       if(button_attack2 && activeweapon == WEP_NEX)
+               drawpic(reticle_pos, "textures/reticle_nex", reticle_size, '1 1 1', current_zoomfraction * cvar("cl_reticle_nex"), DRAWFLAG_NORMAL);
+
        // draw radar
        if(
                        ons_showmap