X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fecs%2Fsystems%2Fphysics.qc;h=2fbb9d9d02862d1fe86712700987b759b96c8ae3;hb=991de5e6922cd3c283de56c3249624f0f1bfe767;hp=e6c2f7ccd8617e0087b19d0224d5e0760174cf3f;hpb=2183056a5b6e75d2e025aa6c718eeb6f87de31b6;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/ecs/systems/physics.qc b/qcsrc/ecs/systems/physics.qc
index e6c2f7ccd..2fbb9d9d0 100644
--- a/qcsrc/ecs/systems/physics.qc
+++ b/qcsrc/ecs/systems/physics.qc
@@ -6,6 +6,8 @@
 void sys_phys_simulate(entity this, float dt);
 void sys_phys_simulate_simple(entity this, float dt);
 
+void sys_phys_postupdate(entity this);
+
 void sys_phys_update(entity this, float dt)
 {
 	if (!IS_CLIENT(this)) {
@@ -43,12 +45,12 @@ void sys_phys_update(entity this, float dt)
 	float maxspeed_mod = (!this.in_swamp) ? 1 : this.swamp_slowdown;  // cvar("g_balance_swamp_moverate");
 
 // conveyors: first fix velocity
-	if (this.conveyor.state) { this.velocity -= this.conveyor.movedir; }
+	if (this.conveyor.active) { this.velocity -= this.conveyor.movedir; }
 	MUTATOR_CALLHOOK(PlayerPhysics, this, dt);
 
 	if (!IS_PLAYER(this)) {
 		sys_phys_spectator_control(this);
-		maxspeed_mod = this.spectatorspeed;
+		maxspeed_mod = STAT(SPECTATORSPEED, this);
 	}
 	sys_phys_fixspeed(this, maxspeed_mod);
 
@@ -63,7 +65,8 @@ void sys_phys_update(entity this, float dt)
 			// if(pointcontents(midpoint + '0 0 2') == CONTENT_WATER)
 			// { this.velocity_z = 70; }
 		}
-		goto end;
+		sys_phys_postupdate(this);
+		return;
 	}
 
 	PM_check_slick(this);
@@ -108,6 +111,7 @@ void sys_phys_update(entity this, float dt)
 		this.com_phys_water = true;
 		sys_phys_simulate(this, dt);
 		this.com_phys_water = false;
+		this.jumppadcount = 0;
 	} else if (time < this.ladder_time) {
 		this.com_phys_friction = PHYS_FRICTION(this);
 		this.com_phys_vel_max = PHYS_MAXSPEED(this) * maxspeed_mod;
@@ -152,10 +156,14 @@ void sys_phys_update(entity this, float dt)
 		this.com_phys_air = false;
 	}
 
-	LABEL(end)
+	sys_phys_postupdate(this);
+}
+
+void sys_phys_postupdate(entity this)
+{
 	if (IS_ONGROUND(this)) { this.lastground = time; }
 // conveyors: then break velocity again
-	if (this.conveyor.state) { this.velocity += this.conveyor.movedir; }
+	if (this.conveyor.active) { this.velocity += this.conveyor.movedir; }
 	this.lastflags = this.flags;
 
 	this.lastclassname = this.classname;
@@ -185,8 +193,7 @@ void sys_phys_simulate(entity this, float dt)
 		// this mimics quakeworld code
 		if (this.com_in_jump && this.waterlevel == WATERLEVEL_SWIMMING && this.velocity_z >= -180 && !this.viewloc) {
 			vector yawangles = '0 1 0' * this.v_angle.y;
-			makevectors(yawangles);
-			vector forward = v_forward;
+			MAKE_VECTORS_NEW(yawangles, forward, right, up);
 			vector spot = this.origin + 24 * forward;
 			spot_z += 8;
 			traceline(spot, spot, MOVE_NOMONSTERS, this);
@@ -202,10 +209,11 @@ void sys_phys_simulate(entity this, float dt)
 			}
 		}
 	}
-	makevectors(vmul(this.v_angle, (this.com_phys_vel_2d ? '0 1 0' : '1 1 1')));
-	// wishvel = v_forward * PHYS_CS(this).movement.x + v_right * PHYS_CS(this).movement.y + v_up * PHYS_CS(this).movement.z;
-	vector wishvel = v_forward * PHYS_CS(this).movement.x
-	    + v_right * PHYS_CS(this).movement.y
+
+	MAKE_VECTORS_NEW(vmul(this.v_angle, (this.com_phys_vel_2d ? '0 1 0' : '1 1 1')), forward, right, up);
+	// wishvel = forward * PHYS_CS(this).movement.x + right * PHYS_CS(this).movement.y + up * PHYS_CS(this).movement.z;
+	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) {
 		if (PHYS_INPUT_BUTTON_CROUCH(this)) {