From: FruitieX Date: Thu, 24 Jun 2010 12:11:58 +0000 (+0300) Subject: force 1:1 aspect on reticle pic, also precache it X-Git-Tag: xonotic-v0.1.0preview~501^2~1^2~17^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=bf5b51084079dc2197390c1b9bd540666a1a205e;p=xonotic%2Fxonotic-data.pk3dir.git force 1:1 aspect on reticle pic, also precache it --- diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc index 2667c29a9..ca0ffb561 100644 --- a/qcsrc/client/View.qc +++ b/qcsrc/client/View.qc @@ -552,13 +552,14 @@ void CSQC_UpdateView(float w, float h) drawstring('0 0 0', "", '1 1 0', '1 1 1', 0, 0); // 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; + 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; + precache_pic("textures/reticle_nex"); if(cvar("cl_reticle_nex")) - if(button_attack2 && activeweapon == WEP_NEX) + if(activeweapon == WEP_NEX && current_zoomfraction) drawpic(reticle_pos, "textures/reticle_nex", reticle_size, '1 1 1', current_zoomfraction * cvar("cl_reticle_nex"), DRAWFLAG_NORMAL); // Draw the mouse cursor