Merge remote branch 'refs/remotes/origin/mirceakitsune/nex_reticle'

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index fbbc14f9b48593477dda4ff70ed420dbdf221054..944ae9e703181d1850d457362b472cb8bfe0e69a 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -206,6 +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_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 1056fd59ae435b9fbffb334ef20f57fb6590aa42..ed1f303e2fafe11c4830f5ccc787b768fbabeb81 100644 (file)
--- a/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@ -341,6 +341,7 @@ void CSQC_Demo_Camera();
 float HUD_WouldDrawScoreboard ();
 float view_set;
 float camera_mode;
+float reticle_type;
 string NextFrameCommand;
 void CSQC_SPIDER_HUD();
 void CSQC_RAPTOR_HUD();
@@ -354,6 +355,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)
@@ -549,6 +552,45 @@ void CSQC_UpdateView(float w, float h)
        // next R_RenderScene call
        drawstring('0 0 0', "", '1 1 0', '1 1 1', 0, 0);
 
+       // Draw the aiming reticle for weapons that use it
+       // reticle_type is changed to the item we are zooming / aiming with, to decide which reticle to use
+       // It must be a persisted float for fading out to work properly (you let go of the zoom button for
+       // the view to go back to normal, so reticle_type would become 0 as we fade out)
+       if(spectatee_status || getstati(STAT_HEALTH) <= 0)
+               reticle_type = 0; // prevent reticle from showing during the respawn zoom effect or for spectators
+       else if(button_zoom)
+               reticle_type = 1; // normal zoom
+       else if(activeweapon == WEP_NEX && button_attack2)
+               reticle_type = 2; // nex zoom
+
+       if(cvar("cl_reticle_stretch"))
+       {
+               reticle_size_x = vid_conwidth;
+               reticle_size_y = vid_conheight;
+               reticle_pos_x = 0;
+               reticle_pos_y = 0;
+       }
+       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_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_item_normal"), DRAWFLAG_NORMAL);
+       }
+       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_item_nex"), DRAWFLAG_NORMAL);
+       }
+
        // Draw the mouse cursor
        // NOTE: drawpic must happen after R_RenderScene for some reason
        //drawpic(getmousepos(), "gfx/cursor.tga", '11 14 0', '1 1 1', 1, 0);

diff --git a/textures/reticle_nex.tga b/textures/reticle_nex.tga
new file mode 100644 (file)
index 0000000..3e0c142
Binary files /dev/null and b/textures/reticle_nex.tga differ

diff --git a/textures/reticle_normal.tga b/textures/reticle_normal.tga
new file mode 100644 (file)
index 0000000..8b82ea8
Binary files /dev/null and b/textures/reticle_normal.tga differ