X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fcl_physics.qc;h=962289e91a2d00e2c49e6d7ae2024d365ceb0681;hp=e211275b0f3eb4f7d1af694562ada31beabe39ae;hb=11c6695a18daf486e320c034cc9d2a42717d74b2;hpb=b8482f4135878ec2af59ecb484c2d6cd97562d18

diff --git a/qcsrc/server/cl_physics.qc b/qcsrc/server/cl_physics.qc
index e211275b0f..962289e91a 100644
--- a/qcsrc/server/cl_physics.qc
+++ b/qcsrc/server/cl_physics.qc
@@ -145,11 +145,6 @@ void PlayerJump (void)
 		}
 	}
 
-	if(g_minstagib && (self.items & IT_INVINCIBLE))
-	{
-		mjumpheight = mjumpheight * cvar("g_minstagib_speed_jumpheight");
-	}
-
 	// sv_jumpspeedcap_min/sv_jumpspeedcap_max act as baseline
 	// velocity bounds.  Final velocity is bound between (jumpheight *
 	// min + jumpheight) and (jumpheight * max + jumpheight);
@@ -707,13 +702,21 @@ void SV_PlayerPhysics()
 	float not_allowed_to_move;
 	string c;
 	
+	maxspd_mod = 1;
+	if(g_minstagib && (self.items & IT_INVINCIBLE))
+		maxspd_mod *= cvar("g_minstagib_speed_highspeed");
+	if(g_nexball && self.ballcarried)
+		maxspd_mod *= cvar("g_nexball_basketball_carrier_highspeed");
+
 	// fix physics stats for g_movement_highspeed
-	self.stat_sv_airaccel_qw = AdjustAirAccelQW(sv_airaccel_qw, autocvar_g_movement_highspeed);
+	self.stat_sv_airaccel_qw = AdjustAirAccelQW(sv_airaccel_qw, autocvar_g_movement_highspeed * maxspd_mod);
+
 	if(sv_airstrafeaccel_qw)
-		self.stat_sv_airstrafeaccel_qw = AdjustAirAccelQW(sv_airstrafeaccel_qw, autocvar_g_movement_highspeed);
+		self.stat_sv_airstrafeaccel_qw = AdjustAirAccelQW(sv_airstrafeaccel_qw, autocvar_g_movement_highspeed * maxspd_mod);
 	else
 		self.stat_sv_airstrafeaccel_qw = 0;
-	self.stat_sv_airspeedlimit_nonqw = sv_airspeedlimit_nonqw * autocvar_g_movement_highspeed;
+
+	self.stat_sv_airspeedlimit_nonqw = sv_airspeedlimit_nonqw * autocvar_g_movement_highspeed * maxspd_mod;
 
     if(self.PlayerPhysplug)
         if(self.PlayerPhysplug())
@@ -861,16 +864,6 @@ void SV_PlayerPhysics()
 		}
 	}
 
-	if(g_minstagib && (self.items & IT_INVINCIBLE))
-	{
-		maxspd_mod = cvar("g_minstagib_speed_moverate");
-	}
-
-	if(g_nexball && self.ballcarried)
-	{
-		maxspd_mod = cvar("g_nexball_basketball_carrier_speed");
-	}
-
 	swampspd_mod = 1;
 	if(self.in_swamp) {
 		swampspd_mod = self.swamp_slowdown; //cvar("g_balance_swamp_moverate");
@@ -1317,7 +1310,7 @@ void SV_PlayerPhysics()
 				rr = RACE_RECORD;
 			race_send_speedaward(MSG_ALL);
 			speedaward_lastsent = speedaward_speed;
-			if (speedaward_speed > speedaward_alltimebest) {
+			if (speedaward_speed > speedaward_alltimebest && speedaward_uid != "") {
 				speedaward_alltimebest = speedaward_speed;
 				speedaward_alltimebest_holder = speedaward_holder;
 				speedaward_alltimebest_uid = speedaward_uid;