From 1317cd12d74dba4ff765d6e18b0b30cdf42002a3 Mon Sep 17 00:00:00 2001
From: Lars Müller <34514239+appgurueu@users.noreply.github.com>
Date: Tue, 20 Sep 2022 10:55:51 +0200
Subject: Fix formula used for acceleration (#12353)

---
 src/client/clientenvironment.cpp | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'src/client/clientenvironment.cpp')

diff --git a/src/client/clientenvironment.cpp b/src/client/clientenvironment.cpp
index d7b3c4950..f5e8b3601 100644
--- a/src/client/clientenvironment.cpp
+++ b/src/client/clientenvironment.cpp
@@ -195,21 +195,24 @@ void ClientEnvironment::step(float dtime)
 		lplayer->applyControl(dtime_part, this);
 
 		// Apply physics
+		lplayer->gravity = 0;
 		if (!free_move) {
 			// Gravity
-			v3f speed = lplayer->getSpeed();
 			if (!is_climbing && !lplayer->in_liquid)
-				speed.Y -= lplayer->movement_gravity *
-					lplayer->physics_override.gravity * dtime_part * 2.0f;
+				// HACK the factor 2 for gravity is arbitrary and should be removed eventually
+				lplayer->gravity = 2 * lplayer->movement_gravity * lplayer->physics_override.gravity;
 
 			// Liquid floating / sinking
 			if (!is_climbing && lplayer->in_liquid &&
 					!lplayer->swimming_vertical &&
 					!lplayer->swimming_pitch)
-				speed.Y -= lplayer->movement_liquid_sink * dtime_part * 2.0f;
+				// HACK the factor 2 for gravity is arbitrary and should be removed eventually
+				lplayer->gravity = 2 * lplayer->movement_liquid_sink;
 
 			// Movement resistance
 			if (lplayer->move_resistance > 0) {
+				v3f speed = lplayer->getSpeed();
+
 				// How much the node's move_resistance blocks movement, ranges
 				// between 0 and 1. Should match the scale at which liquid_viscosity
 				// increase affects other liquid attributes.
@@ -232,15 +235,16 @@ void ClientEnvironment::step(float dtime)
 					(1 - resistance_factor);
 				v3f d = d_wanted.normalize() * (dl * dtime_part * 100.0f);
 				speed += d;
-			}
 
-			lplayer->setSpeed(speed);
+				lplayer->setSpeed(speed);
+			}
 		}
 
 		/*
 			Move the lplayer.
 			This also does collision detection.
 		*/
+
 		lplayer->move(dtime_part, this, position_max_increment,
 			&player_collisions);
 	}
-- 
cgit v1.2.3