X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fecs%2Fsystems%2Fphysics.qc;h=e6c2f7ccd8617e0087b19d0224d5e0760174cf3f;hb=e87123e5fba23f7a8907e6fbab241c5eec5be168;hp=b25c93b2d3d3177342e8994b12a29b26ecceb7dd;hpb=e1bfe1d1d43ac7adedba945d692b37e0aafc453b;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/ecs/systems/physics.qc b/qcsrc/ecs/systems/physics.qc
index b25c93b2d..e6c2f7ccd 100644
--- a/qcsrc/ecs/systems/physics.qc
+++ b/qcsrc/ecs/systems/physics.qc
@@ -15,11 +15,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;
+
+	sys_phys_monitor(this, dt);
 
-	this.buttons_old = PHYS_INPUT_BUTTON_MASK(this);
-	this.movement_old = this.movement;
-	this.v_angle_old = this.v_angle;
+	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);
 
@@ -52,7 +55,8 @@ void sys_phys_update(entity this, float dt)
 	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?
@@ -160,9 +164,6 @@ void sys_phys_update(entity this, float dt)
 /** for players */
 void sys_phys_simulate(entity this, float dt)
 {
-	const vector g = -this.com_phys_gravity;
-	const bool jump = this.com_in_jump;
-
 	if (!this.com_phys_ground && !this.com_phys_air) {
 		// noclipping
 		// flying
@@ -172,6 +173,7 @@ 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;
 			this.velocity = this.velocity * (1 - dt * this.com_phys_friction);
 			this.velocity_z += g.z / 2;
@@ -181,7 +183,7 @@ void sys_phys_simulate(entity this, float dt)
 	if (this.com_phys_water) {
 		// water jump only in certain situations
 		// this mimics quakeworld code
-		if (jump && this.waterlevel == WATERLEVEL_SWIMMING && this.velocity_z >= -180 && !this.viewloc) {
+		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;
@@ -201,10 +203,10 @@ 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);
+	// 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
+	    + '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);
@@ -217,7 +219,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);
@@ -272,7 +274,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,
@@ -289,7 +291,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;
@@ -320,7 +322,7 @@ void sys_phys_simulate(entity this, float dt)
 				}
 
 				// holding jump button swims upward slowly
-				if (jump && !this.viewloc) {
+				if (this.com_in_jump && !this.viewloc) {
 					// was:
 					// lava: 50
 					// slime: 80