X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fclient%2FView.qc;h=2c3ce6b8f54e898e96e8ab05bb0c14e1b15462a6;hp=89681c32a6d2febb42a2e2490565eb7d63545489;hb=580c768d0f2e32d2b545fa80c08c515aeb0ca67a;hpb=fa51f49b0ea8f1d6cd378b9be83cfcbd8f37c298

diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc
index 89681c32a..2c3ce6b8f 100644
--- a/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@ -828,22 +828,28 @@ void CSQC_UpdateView(float w, float h)
 
 				float f, a;
 				wcross_size = drawgetimagesize(wcross_name) * wcross_scale;
+
+				float xyspeed;
+				xyspeed = vlen('1 0 0' * pmove_vel_x + '0 1 0' * pmove_vel_y);
+				if(xyspeed > nex_speed)
+					nex_speed = min(xyspeed, nex_maxvelocity);
+				else
+					nex_speed = (1 - nex_speed_falloff_factor) * nex_speed;
+
 				// ring around crosshair representing bullets left in camping rifle clip
 				if (activeweapon == WEP_CAMPINGRIFLE && cr_maxbullets)
 				{
 					bullets = getstati(STAT_BULLETS_LOADED);
-					a = cvar("crosshair_campingrifle_bulletcounter_alpha");
 					f = bound(0, bullets / cr_maxbullets, 1);
 
+					a = cvar("crosshair_campingrifle_bulletcounter_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) // 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);
+					f = bound(0, (nex_speed - nex_minvelocity) / (nex_maxvelocity - nex_minvelocity), 1);
 
+					a = cvar("crosshair_nexvelocity_alpha");
 					DrawCircleClippedPic(wcross_origin, wcross_size_x * ring_scale, "gfx/crosshair_ring.tga", f, wcross_color, wcross_alpha * a, DRAWFLAG_ADDITIVE);
 				}
 
@@ -883,6 +889,10 @@ void CSQC_UpdateView(float w, float h)
 
 				wcross_size = drawgetimagesize(wcross_name) * wcross_scale;
 				CROSSHAIR_DRAW(wcross_resolution, wcross_name, wcross_alpha * f);
+
+				if(cvar("crosshair_dot"))
+					CROSSHAIR_DRAW(wcross_resolution * cvar("crosshair_dot_size"), "gfx/crosshairdot.tga", wcross_alpha * f * cvar("crosshair_dot_alpha"));
+
 				wcross_name_alpha_goal_prev = f;
 			}
 		}