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

diff --git a/qcsrc/ecs/systems/physics.qc b/qcsrc/ecs/systems/physics.qc
index 0c18e58cf..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)) {
@@ -15,11 +17,14 @@ void sys_phys_update(entity this, float dt)
 	sys_in_update(this, dt);
 
 	sys_phys_fix(this, dt);
-	if (sys_phys_override(this, dt)) { return; } sys_phys_monitor(this, dt);
+	if (sys_phys_override(this, dt))
+		return;
 
-	this.buttons_old = PHYS_INPUT_BUTTON_MASK(this);
-	this.movement_old = this.movement;
-	this.v_angle_old = this.v_angle;
+	sys_phys_monitor(this, dt);
+
+	PHYS_CS(this).movement_old = PHYS_CS(this).movement;
+	PHYS_CS(this).v_angle_old = this.v_angle;
+	PHYS_CS(this).buttons_old = PHYS_INPUT_BUTTON_MASK(this);
 
 	sys_phys_ai(this);
 
@@ -40,26 +45,28 @@ 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);
 
 	if (IS_DEAD(this)) {
 		// handle water here
 		vector midpoint = ((this.absmin + this.absmax) * 0.5);
-		if (pointcontents(midpoint) == CONTENT_WATER) {
+		int cont = pointcontents(midpoint);
+		if (cont == CONTENT_WATER || cont == CONTENT_LAVA || cont == CONTENT_SLIME) {
 			this.velocity = this.velocity * 0.5;
 
 			// do we want this?
 			// if(pointcontents(midpoint + '0 0 2') == CONTENT_WATER)
 			// { this.velocity_z = 70; }
 		}
-		goto end;
+		sys_phys_postupdate(this);
+		return;
 	}
 
 	PM_check_slick(this);
@@ -104,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;
@@ -148,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;
@@ -181,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);
@@ -198,11 +209,12 @@ 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 * this.movement.x + v_right * this.movement.y + v_up * this.movement.z;
-	vector wishvel = v_forward * this.movement.x
-	    + v_right * this.movement.y
-	    + '0 0 1' * this.movement.z * (this.com_phys_vel_2d ? 0 : 1);
+
+	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)) {
 			wishvel.z = -PHYS_MAXSPEED(this);
@@ -215,7 +227,7 @@ void sys_phys_simulate(entity this, float dt)
 	}
 	if (this.com_phys_ladder) {
 		if (this.viewloc) {
-			wishvel.z = this.movement_old.x;
+			wishvel.z = PHYS_CS(this).movement_old.x;
 		}
 		if (this.ladder_entity.classname == "func_water") {
 			float f = vlen(wishvel);
@@ -270,7 +282,7 @@ void sys_phys_simulate(entity this, float dt)
 			// dv/dt = accel * maxspeed * (1 - accelqw) (when fast)
 			// log dv/dt = logaccel + logmaxspeed (when slow)
 			// log dv/dt = logaccel + logmaxspeed + log(1 - accelqw) (when fast)
-			float strafity = IsMoveInDirection(this.movement, -90) + IsMoveInDirection(this.movement, +90);  // if one is nonzero, other is always zero
+			float strafity = IsMoveInDirection(PHYS_CS(this).movement, -90) + IsMoveInDirection(PHYS_CS(this).movement, +90);  // if one is nonzero, other is always zero
 			if (PHYS_MAXAIRSTRAFESPEED(this)) {
 				wishspeed =
 				    min(wishspeed,
@@ -287,7 +299,7 @@ void sys_phys_simulate(entity this, float dt)
 			}
 			// !CPM
 
-			if (PHYS_WARSOWBUNNY_TURNACCEL(this) && accelerating && this.movement.y == 0 && this.movement.x != 0) {
+			if (PHYS_WARSOWBUNNY_TURNACCEL(this) && accelerating && PHYS_CS(this).movement.y == 0 && PHYS_CS(this).movement.x != 0) {
 				PM_AirAccelerate(this, dt, wishdir, wishspeed2);
 			} else {
 				float sidefric = maxairspd ? (PHYS_AIRACCEL_SIDEWAYS_FRICTION(this) / maxairspd) : 0;