From: Mircea Kitsune Date: Tue, 15 Jun 2010 18:40:56 +0000 (+0300) Subject: Make the reticle fade in based on zoom speed. Fix some silly typos as well. Imo this... X-Git-Tag: xonotic-v0.1.0preview~501^2~1^2~23 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=21bac6e5dca000fec9bf13a9a42cf1788357ac01;p=xonotic%2Fxonotic-data.pk3dir.git Make the reticle fade in based on zoom speed. Fix some silly typos as well. Imo this should be ready for testing debating and merging. --- diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index 600a4a4e9..c8e9e8150 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -206,7 +206,7 @@ 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_recticle_nex 1 "draw aiming recticle for the nex weapon's zoom, 0 disables and values between 0 and 1 change alpha" +seta cl_reticle_nex 1 "draw aiming recticle for the nex weapon's zoom, 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 2826bbc42..86e96d2f5 100644 --- a/qcsrc/client/View.qc +++ b/qcsrc/client/View.qc @@ -355,7 +355,8 @@ void CSQC_UpdateView(float w, float h) float fov; float f, i, j; vector v, vo; - vector recticle_pos, recticle_size; + + vector reticle_pos, reticle_size; WaypointSprite_Load(); @@ -579,14 +580,14 @@ void CSQC_UpdateView(float w, float h) self = e; // draw the aiming reticle for weapons that use it (eg. Nex) - recticle_pos_x = 0; - recticle_pos_y = 0; - recticle_size_x = vid_conwidth; - recticle_size_y = vid_conheight; + reticle_pos_x = 0; + reticle_pos_y = 0; + reticle_size_x = vid_conwidth; + reticle_size_y = vid_conheight; - if(cvar("cl_recticle_nex")) + if(cvar("cl_reticle_nex")) if(button_attack2 && activeweapon == WEP_NEX) - drawpic(recticle_pos, "textures/reticle_nex", recticle_size, '1 1 1', cvar("cl_recticle_nex"), DRAWFLAG_NORMAL); + drawpic(reticle_pos, "textures/reticle_nex", reticle_size, '1 1 1', current_zoomfraction * cvar("cl_reticle_nex"), DRAWFLAG_NORMAL); // draw radar if(