X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fcl_physics.qc;h=7d8bb9b0052d61dd153af9cb67ee6cd410b1355c;hb=2abeea68cb262b5b856b98908d1be28eb66a87d3;hp=6ddf7b69ed806e75bf81c1cea5de0307176a03b6;hpb=6b188d663fd973615bd71b58cfd2d7b1b2df0ca9;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/cl_physics.qc b/qcsrc/server/cl_physics.qc
index 6ddf7b69e..7d8bb9b00 100644
--- a/qcsrc/server/cl_physics.qc
+++ b/qcsrc/server/cl_physics.qc
@@ -23,7 +23,7 @@ When you press the jump key
 */
 void PlayerJump (void)
 {
-	if(self.freezetag_frozen)
+	if(self.frozen)
 		return; // no jumping in freezetag when frozen
 
 	float mjumpheight;
@@ -358,7 +358,7 @@ void RaceCarPhysics()
 		rigvel_z -= frametime * autocvar_sv_gravity; // 4x gravity plays better
 		rigvel_xy = vec2(rigvel);
 
-		if(g_bugrigs_planar_movement_car_jumping && !g_touchexplode) // touchexplode is a better way to handle collisions
+		if(g_bugrigs_planar_movement_car_jumping)
 			mt = MOVE_NORMAL;
 		else
 			mt = MOVE_NOMONSTERS;
@@ -855,6 +855,12 @@ void SV_PlayerPhysics()
 	self.disableclientprediction = 0;
 	if(time < self.ladder_time)
 		self.disableclientprediction = 1;
+		
+	if(self.frozen)
+	{
+		self.movement = '0 0 0';
+		self.disableclientprediction = 1;
+	}
 
 	MUTATOR_CALLHOOK(PlayerPhysics);
 
@@ -1057,7 +1063,7 @@ void SV_PlayerPhysics()
 			PM_Accelerate(wishdir, wishspeed, wishspeed, autocvar_sv_accelerate*maxspd_mod, 1, 0, 0, 0);
 		}
 	}
-	else if ((self.items & IT_JETPACK) && self.BUTTON_HOOK && (!autocvar_g_jetpack_fuel || self.ammo_fuel >= 0.01 || self.items & IT_UNLIMITED_WEAPON_AMMO) && !self.freezetag_frozen)
+	else if ((self.items & IT_JETPACK) && self.BUTTON_HOOK && (!autocvar_g_jetpack_fuel || self.ammo_fuel >= 0.01 || self.items & IT_UNLIMITED_WEAPON_AMMO) && !self.frozen)
 	{
 		//makevectors(self.v_angle_y * '0 1 0');
 		makevectors(self.v_angle);