X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fclient%2FView.qc;fp=qcsrc%2Fclient%2FView.qc;h=2fbb07d4eb524692b5155e9fdc516ff2004122cd;hp=9953af664b7b4db76233623bfa69a9c8d2aa166c;hb=392daf627bb137aadf4c156dc8dfc4906475840e;hpb=669ea85f389d64cf59d47c24f9b447843a4e9d57

diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc
index 9953af664b..2fbb07d4eb 100644
--- a/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@ -697,25 +697,6 @@ void CSQC_UpdateView(float w, float h)
 			if(cvar("viewsize") < 120)
 				CSQC_common_hud();
 
-
-		precache_pic("gfx/nex_ring.tga");
-		// ring around crosshair representing velocity-dependent damage for the nex
-		if (activeweapon == WEP_NEX)
-		{
-			float f, a, curvel;
-			vector rgb;
-
-			rgb_x = cvar("crosshair_nexvelocity_color_red");
-			rgb_y = cvar("crosshair_nexvelocity_color_green");
-			rgb_z = cvar("crosshair_nexvelocity_color_blue");
-			a = cvar("crosshair_nexvelocity_alpha");
-
-			curvel = vlen('1 0 0' * pmove_vel_x + '0 1 0' * pmove_vel_y);
-			f = bound(0, (curvel - nex_minvelocity) / (nex_maxvelocity - nex_minvelocity), 1);
-
-			DrawCircleClippedPic('0.5 0 0' * vid_conwidth + '0 0.5 0' * vid_conheight, 0.1 * vid_conheight, "gfx/nex_ring.tga", f, rgb, a, DRAWFLAG_ADDITIVE);
-		}
-
 		// crosshair goes VERY LAST
 		if(!scoreboard_active && !camera_active && intermission != 2) {
 			// TrueAim check
@@ -843,17 +824,28 @@ void CSQC_UpdateView(float w, float h)
 				wcross_scale *= 1 - cvar("_menu_alpha");
 				wcross_alpha *= 1 - cvar("_menu_alpha");
 
+				ring_scale = cvar("crosshair_ring_size");
+
+				float f, a;
+				wcross_size = drawgetimagesize(wcross_name) * wcross_scale;
 				// ring around crosshair representing bullets left in camping rifle clip
-				if (activeweapon == WEP_CAMPINGRIFLE)
+				if (activeweapon == WEP_CAMPINGRIFLE && cr_maxbullets)
 				{
-					ring_scale = cvar("crosshair_campingrifle_ring_size");
-					bullets = bound(0, getstati(STAT_BULLETS_LOADED), 4);
+					bullets = getstati(STAT_BULLETS_LOADED);
+					a = cvar("crosshair_campingrifle_bulletcounter_alpha");
+					f = bound(0, bullets / cr_maxbullets, 1);
+
+					DrawCircleClippedPic(wcross_origin, wcross_size_x * ring_scale, "gfx/crosshair_ring.tga", f, wcross_color, wcross_alpha * a, DRAWFLAG_ADDITIVE);
 				}
-				else
-					bullets = 0;
+				else if (activeweapon == WEP_NEX) // ring around crosshair representing velocity-dependent damage for the nex
+				{
+					float curvel;
+					a = cvar("crosshair_nexvelocity_alpha");
+					curvel = vlen('1 0 0' * pmove_vel_x + '0 1 0' * pmove_vel_y);
+					f = bound(0, (curvel - nex_minvelocity) / (nex_maxvelocity - nex_minvelocity), 1);
 
-#define CROSSHAIR_DRAW_RING(i,j,sz,wcross_name,wcross_alpha) \
-				drawpic(wcross_origin - ('0.5 0 0' * (sz * wcross_size_x * ring_scale + i * wcross_blur) + '0 0.5 0' * (sz * wcross_size_y * ring_scale + j * wcross_blur)), strcat("gfx/rifle_ring_", ftos(bullets)), sz * wcross_size * ring_scale, wcross_color, wcross_alpha, DRAWFLAG_NORMAL)
+					DrawCircleClippedPic(wcross_origin, wcross_size_x * ring_scale, "gfx/crosshair_ring.tga", f, wcross_color, wcross_alpha * a, DRAWFLAG_ADDITIVE);
+				}
 
 #define CROSSHAIR_DO_BLUR(M,sz,wcross_name,wcross_alpha) \
 				do \
@@ -890,11 +882,6 @@ void CSQC_UpdateView(float w, float h)
 				}
 
 				wcross_size = drawgetimagesize(wcross_name) * wcross_scale;
-				if(bullets)
-				{
-					CROSSHAIR_DO_BLUR(CROSSHAIR_DRAW_RING, wcross_resolution, wcross_name, wcross_alpha);
-				}
-
 				CROSSHAIR_DRAW(wcross_resolution, wcross_name, wcross_alpha * f);
 
 				if(cvar("crosshair_dot"))