From: Samual Date: Tue, 15 Feb 2011 23:52:44 +0000 (-0500) Subject: Just some quick changes to the crosshair rings, I will expand this later (maybe for... X-Git-Tag: xonotic-v0.5.0~309^2~17^2^2~6 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ef4e892a376edc383797de36db517bca29aeddca;p=xonotic%2Fxonotic-data.pk3dir.git Just some quick changes to the crosshair rings, I will expand this later (maybe for other weapons too?) --- diff --git a/gfx/crosshair_ring_nexgun.tga b/gfx/crosshair_ring_nexgun.tga new file mode 100644 index 000000000..6100096bf Binary files /dev/null and b/gfx/crosshair_ring_nexgun.tga differ diff --git a/gfx/crosshair_ring_sniperrifle.tga b/gfx/crosshair_ring_sniperrifle.tga new file mode 100644 index 000000000..b25e3509b Binary files /dev/null and b/gfx/crosshair_ring_sniperrifle.tga differ diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc index 7270a9cf1..3fbcfd951 100644 --- a/qcsrc/client/View.qc +++ b/qcsrc/client/View.qc @@ -1083,7 +1083,7 @@ void CSQC_UpdateView(float w, float h) f = bound(0, bullets / cr_maxbullets, 1); 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); + DrawCircleClippedPic(wcross_origin, wcross_size_x * ring_scale, "gfx/crosshair_ring_sniperrifle.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 { @@ -1107,7 +1107,7 @@ void CSQC_UpdateView(float w, float h) // draw the charge a = autocvar_crosshair_ring_nex_outer_alpha; - DrawCircleClippedPic(wcross_origin, wcross_size_x * ring_scale, "gfx/crosshair_ring.tga", nex_charge, wcross_color, wcross_alpha * a, DRAWFLAG_ADDITIVE); + DrawCircleClippedPic(wcross_origin, wcross_size_x * ring_scale, "gfx/crosshair_ring_nexgun.tga", nex_charge, wcross_color, wcross_alpha * a, DRAWFLAG_ADDITIVE); } #define CROSSHAIR_DO_BLUR(M,sz,wcross_name,wcross_alpha) \