X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fcl_physics.qc;h=08f9dee9562f5c9d91c382236f3f0ea56e84e0bf;hp=0cae2a261d8f41f5d9d9998a402e8ef14713b931;hb=a6a3b0cebd6928e3678ee4e97de4093f1b61c58b;hpb=bf825a0dada529d1288564e23223061429d01f31

diff --git a/qcsrc/server/cl_physics.qc b/qcsrc/server/cl_physics.qc
index 0cae2a261d..08f9dee956 100644
--- a/qcsrc/server/cl_physics.qc
+++ b/qcsrc/server/cl_physics.qc
@@ -1091,12 +1091,11 @@ void SV_PlayerPhysics()
 		else
 			fz = bound(0, 1 + self.velocity_z / autocvar_g_jetpack_maxspeed_up, 1);
 
-		float fvel;
-		fvel = vlen(wishvel);
 		wishvel_x *= fxy;
 		wishvel_y *= fxy;
 		wishvel_z = (wishvel_z - autocvar_sv_gravity) * fz + autocvar_sv_gravity;
 
+		float fvel;
 		fvel = min(1, vlen(wishvel) / best);
 		if(autocvar_g_jetpack_fuel && !(self.items & IT_UNLIMITED_WEAPON_AMMO))
 			f = min(1, self.ammo_fuel / (autocvar_g_jetpack_fuel * frametime * fvel));
@@ -1121,7 +1120,7 @@ void SV_PlayerPhysics()
 	{
 		// we get here if we ran out of ammo
 		if((self.items & IT_JETPACK) && self.BUTTON_HOOK && !(buttons_prev & 32) && self.ammo_fuel < 0.01)
-			sprint(self, "You don't have any fuel for the ^2Jetpack\n");
+			Send_Notification(NOTIF_ONE, self, MSG_INFO, INFO_JETPACK_NOFUEL);
 
 		// walking
 		makevectors(self.v_angle_y * '0 1 0');
@@ -1138,20 +1137,6 @@ void SV_PlayerPhysics()
 			self.jumppadcount = 0;
 		}
 
-#ifdef LETS_TEST_FTEQCC
-		if(self.velocity_x || self.velocity_y)
-		{
-			// good
-		}
-		else
-		{
-			if(self.velocity_x)
-				checkclient();
-			if(self.velocity_y)
-				checkclient();
-		}
-#endif
-
 		v = self.velocity;
 		v_z = 0;
 		f = vlen(v);
@@ -1204,7 +1189,7 @@ void SV_PlayerPhysics()
 		float wishspeed0;
 		// we get here if we ran out of ammo
 		if((self.items & IT_JETPACK) && self.BUTTON_HOOK && !(buttons_prev & 32) && self.ammo_fuel < 0.01)
-			sprint(self, "You don't have any fuel for the ^2Jetpack\n");
+			Send_Notification(NOTIF_ONE, self, MSG_INFO, INFO_JETPACK_NOFUEL);
 
 		if(maxspd_mod < 1)
 		{