]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Just some quick changes to the crosshair rings, I will expand this later (maybe for...
authorSamual <samual@xonotic.org>
Tue, 15 Feb 2011 23:52:44 +0000 (18:52 -0500)
committerSamual <samual@xonotic.org>
Tue, 15 Feb 2011 23:52:44 +0000 (18:52 -0500)
gfx/crosshair_ring_nexgun.tga [new file with mode: 0644]
gfx/crosshair_ring_sniperrifle.tga [new file with mode: 0644]
qcsrc/client/View.qc

diff --git a/gfx/crosshair_ring_nexgun.tga b/gfx/crosshair_ring_nexgun.tga
new file mode 100644 (file)
index 0000000..6100096
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 (file)
index 0000000..b25e350
Binary files /dev/null and b/gfx/crosshair_ring_sniperrifle.tga differ
index 7270a9cf19e0882a9f41bf26434ff325dcb33f9f..3fbcfd9512f551a48db03aac0e16df1e3c6615af 100644 (file)
@@ -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) \