]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Correct code for crosshair ring. Still need to rename some stuff though
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Fri, 21 Jan 2011 02:12:58 +0000 (04:12 +0200)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Fri, 21 Jan 2011 02:12:58 +0000 (04:12 +0200)
qcsrc/client/View.qc

index e5d517e356c79c386be287316523603760ef93ba..8f64e8d866e5a5b2824d2658f7e8c45c9ae48d63 100644 (file)
@@ -996,7 +996,7 @@ void CSQC_UpdateView(float w, float h)
                                nex_charge_movingavg = nex_charge;
 
                        // ring around crosshair representing bullets left in camping rifle clip
-                       //if (activeweapon == WEP_SNIPERRIFLE && cr_maxbullets)
+                       if (cr_maxbullets)
                        {
                                bullets = getstati(STAT_BULLETS_LOADED);
                                f = bound(0, bullets / cr_maxbullets, 1);
@@ -1004,7 +1004,7 @@ void CSQC_UpdateView(float w, float h)
                                a = autocvar_crosshair_ring_sniperrifle_alpha;
                                DrawCircleClippedPic(wcross_origin, wcross_size_x * ring_scale, "gfx/crosshair_ring.tga", f, wcross_color, wcross_alpha * a, DRAWFLAG_ADDITIVE);
                        }
-                       /*else*/ if (activeweapon == WEP_NEX && nex_charge) // ring around crosshair representing velocity-dependent damage for the nex
+                       if (activeweapon == WEP_NEX && nex_charge) // ring around crosshair representing velocity-dependent damage for the nex
                        {
                                if(nex_chargepool || use_nex_chargepool)
                                {