X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fecs%2Fsystems%2Fphysics.qc;h=c7fc88dc93593159e524a4e9920b32481362fdf2;hb=5dc828e3b59c65f75c870d4a57e34c023cdbdb86;hp=e8c30dda5d4c710a6fbd348a8136bbf4d4888aae;hpb=1be16938d890b6cefb5c5a176ea1dd886a479321;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/ecs/systems/physics.qc b/qcsrc/ecs/systems/physics.qc
index e8c30dda5d..c7fc88dc93 100644
--- a/qcsrc/ecs/systems/physics.qc
+++ b/qcsrc/ecs/systems/physics.qc
@@ -90,13 +90,9 @@ void sys_phys_update(entity this, float dt)
 	if (this.flags & FL_WATERJUMP) {
 		this.velocity_x = this.movedir.x;
 		this.velocity_y = this.movedir.y;
-		if (this.waterlevel == WATERLEVEL_NONE
-		    || time > PHYS_TELEPORT_TIME(this)
-		    || PHYS_WATERJUMP_TIME(this) <= 0
-		   ) {
+		if (time > this.teleport_time || this.waterlevel == WATERLEVEL_NONE) {
 			this.flags &= ~FL_WATERJUMP;
-			PHYS_TELEPORT_TIME(this) = 0;
-			PHYS_WATERJUMP_TIME(this) = 0;
+			this.teleport_time = 0;
 		}
 	} else if (MUTATOR_CALLHOOK(PM_Physics, this, maxspeed_mod, dt)) {
 		// handled
@@ -117,18 +113,18 @@ void sys_phys_update(entity this, float dt)
 		sys_phys_simulate(this, dt);
 		this.com_phys_water = false;
 		this.jumppadcount = 0;
-	} else if (time < this.ladder_time) {
+	} else if (this.ladder_entity) {
 		this.com_phys_friction = PHYS_FRICTION(this);
 		this.com_phys_vel_max = PHYS_MAXSPEED(this) * maxspeed_mod;
 		this.com_phys_acc_rate = PHYS_ACCELERATE(this) * maxspeed_mod;
-		this.com_phys_gravity = '0 0 -1' * PHYS_GRAVITY(this) * dt;
+		this.com_phys_gravity = -PHYS_GRAVITY(this) * dt;
 		if (PHYS_ENTGRAVITY(this)) { this.com_phys_gravity *= PHYS_ENTGRAVITY(this); }
 		this.com_phys_ladder = true;
 		this.com_phys_friction_air = true;
 		sys_phys_simulate(this, dt);
 		this.com_phys_friction_air = false;
 		this.com_phys_ladder = false;
-		this.com_phys_gravity = '0 0 0';
+		this.com_phys_gravity = 0;
 	} else if (ITEMS_STAT(this) & IT_USING_JETPACK) {
 		PM_jetpack(this, maxspeed_mod, dt);
 	} else if (IS_ONGROUND(this) && (!IS_ONSLICK(this) || !PHYS_SLICK_APPLYGRAVITY(this))) {
@@ -139,14 +135,14 @@ void sys_phys_update(entity this, float dt)
 			}
 		}
 		this.com_phys_vel_max = PHYS_MAXSPEED(this) * maxspeed_mod;
-		this.com_phys_gravity = '0 0 -1' * PHYS_GRAVITY(this) * dt;
+		this.com_phys_gravity = -PHYS_GRAVITY(this) * dt;
 		if (PHYS_ENTGRAVITY(this)) { this.com_phys_gravity *= PHYS_ENTGRAVITY(this); }
 		this.com_phys_ground = true;
 		this.com_phys_vel_2d = true;
 		sys_phys_simulate(this, dt);
 		this.com_phys_vel_2d = false;
 		this.com_phys_ground = false;
-		this.com_phys_gravity = '0 0 0';
+		this.com_phys_gravity = 0;
 	} else {
 		this.com_phys_acc_rate_air = PHYS_AIRACCELERATE(this) * min(maxspeed_mod, 1);
 		this.com_phys_acc_rate_air_stop = PHYS_AIRSTOPACCELERATE(this) * maxspeed_mod;
@@ -186,10 +182,10 @@ void sys_phys_simulate(entity this, float dt)
 		UNSET_ONGROUND(this);
 
 		if (this.com_phys_friction_air) {
-			const vector g = -this.com_phys_gravity;
-			this.velocity_z += g.z / 2;
+			const float grav = -this.com_phys_gravity;
+			this.velocity_z += grav / 2;
 			this.velocity = this.velocity * (1 - dt * this.com_phys_friction);
-			this.velocity_z += g.z / 2;
+			this.velocity_z += grav / 2;
 		}
 	}
 
@@ -222,14 +218,24 @@ void sys_phys_simulate(entity this, float dt)
 	vector wishvel = forward * PHYS_CS(this).movement.x
 	    + right * PHYS_CS(this).movement.y
 	    + '0 0 1' * PHYS_CS(this).movement.z * (this.com_phys_vel_2d ? 0 : 1);
-	if (this.com_phys_water && !PHYS_FROZEN(this)) {
-		if (PHYS_INPUT_BUTTON_CROUCH(this)) {
-			wishvel.z = -PHYS_MAXSPEED(this);
+	if (this.com_phys_water) {
+		if (PHYS_FROZEN(this))
+		{
+			if(this.waterlevel >= WATERLEVEL_SUBMERGED && this.velocity.z >= -70) // don't change the speed too abruptally
+				wishvel = '0 0 160'; // resurface
+			else if(this.waterlevel >= WATERLEVEL_SWIMMING && this.velocity.z > 0)
+				wishvel = eZ * 1.3 * min(this.velocity.z, 160); // resurface a bit more above the surface
 		}
-		if (this.viewloc) {
-			wishvel.z = -160;    // drift anyway
-		} else if (wishvel == '0 0 0') {
-			wishvel = '0 0 -60'; // drift towards bottom
+		else
+		{
+			if (PHYS_INPUT_BUTTON_CROUCH(this)) {
+				wishvel.z = -PHYS_MAXSPEED(this);
+			}
+			if (this.viewloc) {
+				wishvel.z = -160;    // drift anyway
+			} else if (wishvel == '0 0 0') {
+				wishvel = '0 0 -60'; // drift towards bottom
+			}
 		}
 	}
 	if (this.com_phys_ladder) {
@@ -261,8 +267,7 @@ void sys_phys_simulate(entity this, float dt)
 	float wishspeed = min(vlen(wishvel), this.com_phys_vel_max);
 
 	if (this.com_phys_air) {
-		if ((IS_SVQC && time >= PHYS_TELEPORT_TIME(this))
-		    ||  (IS_CSQC && PHYS_WATERJUMP_TIME(this) <= 0)) {
+		if (!(this.flags & FL_WATERJUMP)) {
 			// apply air speed limit
 			float airaccelqw = PHYS_AIRACCEL_QW(this);
 			float wishspeed0 = wishspeed;
@@ -323,7 +328,7 @@ void sys_phys_simulate(entity this, float dt)
 		if (this.com_phys_water) {
 			wishspeed *= 0.7;
 
-			//	if (PHYS_WATERJUMP_TIME(this) <= 0) // TODO: use
+			//	if (!(this.flags & FL_WATERJUMP)) // TODO: use
 			{
 				// water friction
 				float f = 1 - dt * PHYS_FRICTION(this);
@@ -407,7 +412,7 @@ void sys_phys_simulate(entity this, float dt)
 			return;
 		}
 
-		if (IS_CSQC ? PHYS_WATERJUMP_TIME(this) <= 0 : time >= PHYS_TELEPORT_TIME(this)) {
+		if (!(this.flags & FL_WATERJUMP)) {
 			PM_Accelerate(this, dt, wishdir, wishspeed, wishspeed, this.com_phys_acc_rate, 1, 0, 0, 0);
 		}
 	}
@@ -423,7 +428,6 @@ void sys_phys_simulate_simple(entity this, float dt)
 	vector g = '0 0 0';
 	if (this.com_phys_gravity_factor && !g) g = '0 0 -1' * PHYS_GRAVITY(NULL);
 
-	vector acc = this.com_phys_acc;
 	vector vel = this.com_phys_vel;
 	vector pos = this.com_phys_pos;
 
@@ -496,7 +500,6 @@ void sys_phys_simulate_simple(entity this, float dt)
 		ClipVelocity(vel, trace_plane_normal, vel, 1);
 	}
 
-	this.com_phys_acc = acc;
 	this.com_phys_vel = vel;
 	this.com_phys_pos = pos;
 	setorigin(this, this.com_phys_pos);