Extend pitch fly mode to swimming (#7943)

builtin/settingtypes.txt

@@ -62,8 +62,8 @@ enable_build_where_you_stand (Build inside player) bool false
 #    This requires the "fly" privilege on the server.
 free_move (Flying) bool false
 
-#    If enabled together with fly mode, makes move directions relative to the player's pitch.
-pitch_fly (Pitch fly mode) bool true
+#    If enabled, makes move directions relative to the player's pitch when flying or swimming.
+pitch_move (Pitch move mode) bool false
 
 #    Fast movement (via the "special" key).
 #    This requires the "fast" privilege on the server.
@@ -177,9 +177,9 @@ keymap_rangeselect (Range select key) key KEY_KEY_R
 #    See http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3
 keymap_freemove (Fly key) key KEY_KEY_K
 
-#    Key for toggling pitch fly mode.
+#    Key for toggling pitch move mode.
 #    See http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3
-keymap_pitchfly (Pitch fly key) key KEY_KEY_L
+keymap_pitchmove (Pitch move key) key KEY_KEY_L
 
 #    Key for toggling fast mode.
 #    See http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3

minetest.conf.example

@@ -28,9 +28,9 @@
 #    type: bool
 # free_move = false
 
-#    If enabled together with fly mode, makes move directions relative to the player's pitch.
+#    If enabled, makes move directions relative to the player's pitch when flying or swimming.
 #    type: bool
-# pitch_fly = false
+# pitch_move = false
 
 #    Fast movement (via the "special" key).
 #    This requires the "fast" privilege on the server.
@@ -175,10 +175,10 @@
 #    type: key
 # keymap_freemove = KEY_KEY_K
 
-#    Key for toggling pitch fly mode.
+#    Key for toggling pitch move mode.
 #    See http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3
 #    type: key
-# keymap_pitchfly = KEY_KEY_L
+# keymap_pitchmove = KEY_KEY_L
 
 #    Key for toggling fast mode.
 #    See http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3

src/client/clientenvironment.cpp

@@ -0,0 +1,482 @@
+/*
+Minetest
+Copyright (C) 2010-2017 celeron55, Perttu Ahola <celeron55@gmail.com>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#include "util/serialize.h"
+#include "util/pointedthing.h"
+#include "client.h"
+#include "clientenvironment.h"
+#include "clientsimpleobject.h"
+#include "clientmap.h"
+#include "scripting_client.h"
+#include "mapblock_mesh.h"
+#include "event.h"
+#include "collision.h"
+#include "nodedef.h"
+#include "profiler.h"
+#include "raycast.h"
+#include "voxelalgorithms.h"
+#include "settings.h"
+#include "content_cao.h"
+#include <algorithm>
+#include "client/renderingengine.h"
+
+/*
+	ClientEnvironment
+*/
+
+ClientEnvironment::ClientEnvironment(ClientMap *map,
+	ITextureSource *texturesource, Client *client):
+	Environment(client),
+	m_map(map),
+	m_texturesource(texturesource),
+	m_client(client)
+{
+	char zero = 0;
+	memset(attachement_parent_ids, zero, sizeof(attachement_parent_ids));
+}
+
+ClientEnvironment::~ClientEnvironment()
+{
+	m_ao_manager.clear();
+
+	for (auto &simple_object : m_simple_objects) {
+		delete simple_object;
+	}
+
+	// Drop/delete map
+	m_map->drop();
+
+	delete m_local_player;
+}
+
+Map & ClientEnvironment::getMap()
+{
+	return *m_map;
+}
+
+ClientMap & ClientEnvironment::getClientMap()
+{
+	return *m_map;
+}
+
+void ClientEnvironment::setLocalPlayer(LocalPlayer *player)
+{
+	/*
+		It is a failure if already is a local player
+	*/
+	FATAL_ERROR_IF(m_local_player != NULL,
+		"Local player already allocated");
+
+	m_local_player = player;
+}
+
+void ClientEnvironment::step(float dtime)
+{
+	/* Step time of day */
+	stepTimeOfDay(dtime);
+
+	// Get some settings
+	bool fly_allowed = m_client->checkLocalPrivilege("fly");
+	bool free_move = fly_allowed && g_settings->getBool("free_move");
+
+	// Get local player
+	LocalPlayer *lplayer = getLocalPlayer();
+	assert(lplayer);
+	// collision info queue
+	std::vector<CollisionInfo> player_collisions;
+
+	/*
+		Get the speed the player is going
+	*/
+	bool is_climbing = lplayer->is_climbing;
+
+	f32 player_speed = lplayer->getSpeed().getLength();
+
+	/*
+		Maximum position increment
+	*/
+	//f32 position_max_increment = 0.05*BS;
+	f32 position_max_increment = 0.1*BS;
+
+	// Maximum time increment (for collision detection etc)
+	// time = distance / speed
+	f32 dtime_max_increment = 1;
+	if(player_speed > 0.001)
+		dtime_max_increment = position_max_increment / player_speed;
+
+	// Maximum time increment is 10ms or lower
+	if(dtime_max_increment > 0.01)
+		dtime_max_increment = 0.01;
+
+	// Don't allow overly huge dtime
+	if(dtime > 0.5)
+		dtime = 0.5;
+
+	f32 dtime_downcount = dtime;
+
+	/*
+		Stuff that has a maximum time increment
+	*/
+
+	u32 loopcount = 0;
+	do
+	{
+		loopcount++;
+
+		f32 dtime_part;
+		if(dtime_downcount > dtime_max_increment)
+		{
+			dtime_part = dtime_max_increment;
+			dtime_downcount -= dtime_part;
+		}
+		else
+		{
+			dtime_part = dtime_downcount;
+			/*
+				Setting this to 0 (no -=dtime_part) disables an infinite loop
+				when dtime_part is so small that dtime_downcount -= dtime_part
+				does nothing
+			*/
+			dtime_downcount = 0;
+		}
+
+		/*
+			Handle local player
+		*/
+
+		{
+			// Apply physics
+			if (!free_move && !is_climbing) {
+				// Gravity
+				v3f speed = lplayer->getSpeed();
+				if (!lplayer->in_liquid)
+					speed.Y -= lplayer->movement_gravity *
+						lplayer->physics_override_gravity * dtime_part * 2.0f;
+
+				// Liquid floating / sinking
+				if (lplayer->in_liquid && !lplayer->swimming_vertical &&
+						!lplayer->swimming_pitch)
+					speed.Y -= lplayer->movement_liquid_sink * dtime_part * 2.0f;
+
+				// Liquid resistance
+				if (lplayer->in_liquid_stable || lplayer->in_liquid) {
+					// How much the node's viscosity blocks movement, ranges
+					// between 0 and 1. Should match the scale at which viscosity
+					// increase affects other liquid attributes.
+					static const f32 viscosity_factor = 0.3f;
+
+					v3f d_wanted = -speed / lplayer->movement_liquid_fluidity;
+					f32 dl = d_wanted.getLength();
+					if (dl > lplayer->movement_liquid_fluidity_smooth)
+						dl = lplayer->movement_liquid_fluidity_smooth;
+
+					dl *= (lplayer->liquid_viscosity * viscosity_factor) +
+						(1 - viscosity_factor);
+					v3f d = d_wanted.normalize() * (dl * dtime_part * 100.0f);
+					speed += d;
+				}
+
+				lplayer->setSpeed(speed);
+			}
+
+			/*
+				Move the lplayer.
+				This also does collision detection.
+			*/
+			lplayer->move(dtime_part, this, position_max_increment,
+				&player_collisions);
+		}
+	} while (dtime_downcount > 0.001);
+
+	bool player_immortal = lplayer->getCAO() && lplayer->getCAO()->isImmortal();
+
+	for (const CollisionInfo &info : player_collisions) {
+		v3f speed_diff = info.new_speed - info.old_speed;;
+		// Handle only fall damage
+		// (because otherwise walking against something in fast_move kills you)
+		if (speed_diff.Y < 0 || info.old_speed.Y >= 0)
+			continue;
+		// Get rid of other components
+		speed_diff.X = 0;
+		speed_diff.Z = 0;
+		f32 pre_factor = 1; // 1 hp per node/s
+		f32 tolerance = BS*14; // 5 without damage
+		f32 post_factor = 1; // 1 hp per node/s
+		if (info.type == COLLISION_NODE) {
+			const ContentFeatures &f = m_client->ndef()->
+				get(m_map->getNodeNoEx(info.node_p));
+			// Determine fall damage multiplier
+			int addp = itemgroup_get(f.groups, "fall_damage_add_percent");
+			pre_factor = 1.0f + (float)addp / 100.0f;
+		}
+		float speed = pre_factor * speed_diff.getLength();
+		if (speed > tolerance && !player_immortal) {
+			f32 damage_f = (speed - tolerance) / BS * post_factor;
+			u8 damage = (u8)MYMIN(damage_f + 0.5, 255);
+			if (damage != 0) {
+				damageLocalPlayer(damage, true);
+				m_client->getEventManager()->put(
+					new SimpleTriggerEvent(MtEvent::PLAYER_FALLING_DAMAGE));
+			}
+		}
+	}
+
+	if (m_client->modsLoaded())
+		m_script->environment_step(dtime);
+
+	// Update lighting on local player (used for wield item)
+	u32 day_night_ratio = getDayNightRatio();
+	{
+		// Get node at head
+
+		// On InvalidPositionException, use this as default
+		// (day: LIGHT_SUN, night: 0)
+		MapNode node_at_lplayer(CONTENT_AIR, 0x0f, 0);
+
+		v3s16 p = lplayer->getLightPosition();
+		node_at_lplayer = m_map->getNodeNoEx(p);
+
+		u16 light = getInteriorLight(node_at_lplayer, 0, m_client->ndef());
+		final_color_blend(&lplayer->light_color, light, day_night_ratio);
+	}
+
+	/*
+		Step active objects and update lighting of them
+	*/
+
+	bool update_lighting = m_active_object_light_update_interval.step(dtime, 0.21);
+	auto cb_state = [this, dtime, update_lighting, day_night_ratio] (ClientActiveObject *cao) {
+		// Step object
+		cao->step(dtime, this);
+
+		if (update_lighting) {
+			// Update lighting
+			u8 light = 0;
+			bool pos_ok;
+
+			// Get node at head
+			v3s16 p = cao->getLightPosition();
+			MapNode n = this->m_map->getNodeNoEx(p, &pos_ok);
+			if (pos_ok)
+				light = n.getLightBlend(day_night_ratio, m_client->ndef());
+			else
+				light = blend_light(day_night_ratio, LIGHT_SUN, 0);
+
+			cao->updateLight(light);
+		}
+	};
+
+	m_ao_manager.step(dtime, cb_state);
+
+	/*
+		Step and handle simple objects
+	*/
+	g_profiler->avg("CEnv: num of simple objects", m_simple_objects.size());
+	for (auto i = m_simple_objects.begin(); i != m_simple_objects.end();) {
+		auto cur = i;
+		ClientSimpleObject *simple = *cur;
+
+		simple->step(dtime);
+		if(simple->m_to_be_removed) {
+			delete simple;
+			i = m_simple_objects.erase(cur);
+		}
+		else {
+			++i;
+		}
+	}
+}
+
+void ClientEnvironment::addSimpleObject(ClientSimpleObject *simple)
+{
+	m_simple_objects.push_back(simple);
+}
+
+GenericCAO* ClientEnvironment::getGenericCAO(u16 id)
+{
+	ClientActiveObject *obj = getActiveObject(id);
+	if (obj && obj->getType() == ACTIVEOBJECT_TYPE_GENERIC)
+		return (GenericCAO*) obj;
+
+	return NULL;
+}
+
+bool isFreeClientActiveObjectId(const u16 id,
+	ClientActiveObjectMap &objects)
+{
+	return id != 0 && objects.find(id) == objects.end();
+
+}
+
+u16 getFreeClientActiveObjectId(ClientActiveObjectMap &objects)
+{
+	// try to reuse id's as late as possible
+	static u16 last_used_id = 0;
+	u16 startid = last_used_id;
+	for(;;) {
+		last_used_id ++;
+		if (isFreeClientActiveObjectId(last_used_id, objects))
+			return last_used_id;
+
+		if (last_used_id == startid)
+			return 0;
+	}
+}
+
+u16 ClientEnvironment::addActiveObject(ClientActiveObject *object)
+{
+	// Register object. If failed return zero id
+	if (!m_ao_manager.registerObject(object))
+		return 0;
+
+	object->addToScene(m_texturesource);
+
+	// Update lighting immediately
+	u8 light = 0;
+	bool pos_ok;
+
+	// Get node at head
+	v3s16 p = object->getLightPosition();
+	MapNode n = m_map->getNodeNoEx(p, &pos_ok);
+	if (pos_ok)
+		light = n.getLightBlend(getDayNightRatio(), m_client->ndef());
+	else
+		light = blend_light(getDayNightRatio(), LIGHT_SUN, 0);
+
+	object->updateLight(light);
+	return object->getId();
+}
+
+void ClientEnvironment::addActiveObject(u16 id, u8 type,
+	const std::string &init_data)
+{
+	ClientActiveObject* obj =
+		ClientActiveObject::create((ActiveObjectType) type, m_client, this);
+	if(obj == NULL)
+	{
+		infostream<<"ClientEnvironment::addActiveObject(): "
+			<<"id="<<id<<" type="<<type<<": Couldn't create object"
+			<<std::endl;
+		return;
+	}
+
+	obj->setId(id);
+
+	try
+	{
+		obj->initialize(init_data);
+	}
+	catch(SerializationError &e)
+	{
+		errorstream<<"ClientEnvironment::addActiveObject():"
+			<<" id="<<id<<" type="<<type
+			<<": SerializationError in initialize(): "
+			<<e.what()
+			<<": init_data="<<serializeJsonString(init_data)
+			<<std::endl;
+	}
+
+	addActiveObject(obj);
+}
+
+void ClientEnvironment::processActiveObjectMessage(u16 id, const std::string &data)
+{
+	ClientActiveObject *obj = getActiveObject(id);
+	if (obj == NULL) {
+		infostream << "ClientEnvironment::processActiveObjectMessage():"
+			<< " got message for id=" << id << ", which doesn't exist."
+			<< std::endl;
+		return;
+	}
+
+	try {
+		obj->processMessage(data);
+	} catch (SerializationError &e) {
+		errorstream<<"ClientEnvironment::processActiveObjectMessage():"
+			<< " id=" << id << " type=" << obj->getType()
+			<< " SerializationError in processMessage(): " << e.what()
+			<< std::endl;
+	}
+}
+
+/*
+	Callbacks for activeobjects
+*/
+
+void ClientEnvironment::damageLocalPlayer(u8 damage, bool handle_hp)
+{
+	LocalPlayer *lplayer = getLocalPlayer();
+	assert(lplayer);
+
+	if (handle_hp) {
+		if (lplayer->hp > damage)
+			lplayer->hp -= damage;
+		else
+			lplayer->hp = 0;
+	}
+
+	ClientEnvEvent event;
+	event.type = CEE_PLAYER_DAMAGE;
+	event.player_damage.amount = damage;
+	event.player_damage.send_to_server = handle_hp;
+	m_client_event_queue.push(event);
+}
+
+/*
+	Client likes to call these
+*/
+
+ClientEnvEvent ClientEnvironment::getClientEnvEvent()
+{
+	FATAL_ERROR_IF(m_client_event_queue.empty(),
+			"ClientEnvironment::getClientEnvEvent(): queue is empty");
+
+	ClientEnvEvent event = m_client_event_queue.front();
+	m_client_event_queue.pop();
+	return event;
+}
+
+void ClientEnvironment::getSelectedActiveObjects(
+	const core::line3d<f32> &shootline_on_map,
+	std::vector<PointedThing> &objects)
+{
+	std::vector<DistanceSortedActiveObject> allObjects;
+	getActiveObjects(shootline_on_map.start,
+		shootline_on_map.getLength() + 10.0f, allObjects);
+	const v3f line_vector = shootline_on_map.getVector();
+
+	for (const auto &allObject : allObjects) {
+		ClientActiveObject *obj = allObject.obj;
+		aabb3f selection_box;
+		if (!obj->getSelectionBox(&selection_box))
+			continue;
+
+		const v3f &pos = obj->getPosition();
+		aabb3f offsetted_box(selection_box.MinEdge + pos,
+			selection_box.MaxEdge + pos);
+
+		v3f current_intersection;
+		v3s16 current_normal;
+		if (boxLineCollision(offsetted_box, shootline_on_map.start, line_vector,
+				&current_intersection, &current_normal)) {
+			objects.emplace_back((s16) obj->getId(), current_intersection, current_normal,
+				(current_intersection - shootline_on_map.start).getLengthSQ());
+		}
+	}
+}

src/client/keys.h

@@ -48,7 +48,7 @@ public:
 		CONSOLE,
 		MINIMAP,
 		FREEMOVE,
-		PITCHFLY,
+		PITCHMOVE,
 		FASTMOVE,
 		NOCLIP,
 		HOTBAR_PREV,

src/defaultsettings.cpp

@@ -42,7 +42,7 @@ void set_default_settings(Settings *settings)
 	settings->setDefault("meshgen_block_cache_size", "20");
 	settings->setDefault("enable_vbo", "true");
 	settings->setDefault("free_move", "false");
-	settings->setDefault("pitch_fly", "true");
+	settings->setDefault("pitch_move", "true");
 	settings->setDefault("fast_move", "false");
 	settings->setDefault("noclip", "false");
 	settings->setDefault("screenshot_path", ".");
@@ -80,7 +80,7 @@ void set_default_settings(Settings *settings)
 	settings->setDefault("keymap_console", "KEY_F10");
 	settings->setDefault("keymap_rangeselect", "KEY_KEY_R");
 	settings->setDefault("keymap_freemove", "KEY_KEY_K");
-	settings->setDefault("keymap_pitchfly", "KEY_KEY_L");
+	settings->setDefault("keymap_pitchmove", "KEY_KEY_L");
 	settings->setDefault("keymap_fastmove", "KEY_KEY_J");
 	settings->setDefault("keymap_noclip", "KEY_KEY_H");
 	settings->setDefault("keymap_hotbar_next", "KEY_KEY_N");

src/game.cpp

@@ -1069,7 +1069,7 @@ void KeyCache::populate()
 	key[KeyType::MINIMAP]      = getKeySetting("keymap_minimap");
 	key[KeyType::FREEMOVE]     = getKeySetting("keymap_freemove");
 	key[KeyType::FASTMOVE]     = getKeySetting("keymap_fastmove");
-	key[KeyType::PITCHFLY]     = getKeySetting("keymap_pitchfly");
+	key[KeyType::PITCHMOVE]    = getKeySetting("keymap_pitchmove");
 	key[KeyType::NOCLIP]       = getKeySetting("keymap_noclip");
 	key[KeyType::HOTBAR_PREV]  = getKeySetting("keymap_hotbar_previous");
 	key[KeyType::HOTBAR_NEXT]  = getKeySetting("keymap_hotbar_next");
@@ -1261,7 +1261,7 @@ protected:
 	void openConsole(float scale, const wchar_t *line=NULL);
 	void toggleFreeMove();
 	void toggleFreeMoveAlt();
-	void togglePitchFly();
+	void togglePitchMove();
 	void toggleFast();
 	void toggleNoClip();
 	void toggleCinematic();
@@ -2521,8 +2521,8 @@ void Game::processKeyInput()
 		toggleFreeMove();
 	} else if (wasKeyDown(KeyType::JUMP)) {
 		toggleFreeMoveAlt();
-	} else if (wasKeyDown(KeyType::PITCHFLY)) {
-		togglePitchFly();
+	} else if (wasKeyDown(KeyType::PITCHMOVE)) {
+		togglePitchMove();
 	} else if (wasKeyDown(KeyType::FASTMOVE)) {
 		toggleFast();
 	} else if (wasKeyDown(KeyType::NOCLIP)) {
@@ -2742,17 +2742,15 @@ void Game::toggleFreeMoveAlt()
 }
 
 
-void Game::togglePitchFly()
+void Game::togglePitchMove()
 {
 	static const wchar_t *msg[] = { L"Pitch move mode disabled", L"Pitch move mode enabled" };
 
-	bool pitch_fly = !g_settings->getBool("pitch_fly");
-	g_settings->set("pitch_fly", bool_to_cstr(pitch_fly));
+	bool pitch_move = !g_settings->getBool("pitch_move");
+	g_settings->set("pitch_move", bool_to_cstr(pitch_move));
 
 	runData.statustext_time = 0;
-	m_statustext = msg[pitch_fly];
-	if (pitch_fly && !client->checkPrivilege("fly"))
-		m_statustext += L" (note: no 'fly' privilege)";
+	m_statustext = msg[pitch_move];
 }
 
 

src/guiKeyChangeMenu.cpp

@@ -48,7 +48,7 @@ enum
 	GUI_ID_KEY_USE_BUTTON,
 	GUI_ID_KEY_FLY_BUTTON,
 	GUI_ID_KEY_FAST_BUTTON,
-	GUI_ID_KEY_PITCHFLY_BUTTON,
+	GUI_ID_KEY_PITCHMOVE_BUTTON,
 	GUI_ID_KEY_JUMP_BUTTON,
 	GUI_ID_KEY_NOCLIP_BUTTON,
 	GUI_ID_KEY_CINEMATIC_BUTTON,
@@ -426,7 +426,7 @@ void GUIKeyChangeMenu::init_keys()
 	this->add_key(GUI_ID_KEY_CONSOLE_BUTTON,   wgettext("Console"),          "keymap_console");
 	this->add_key(GUI_ID_KEY_FLY_BUTTON,       wgettext("Toggle fly"),       "keymap_freemove");
 	this->add_key(GUI_ID_KEY_FAST_BUTTON,      wgettext("Toggle fast"),      "keymap_fastmove");
-	this->add_key(GUI_ID_KEY_PITCHFLY_BUTTON,  wgettext("Toggle pitch fly"), "keymap_pitchfly");
+	this->add_key(GUI_ID_KEY_PITCHMOVE_BUTTON, wgettext("Toggle pitch fly"), "keymap_pitchmove");
 	this->add_key(GUI_ID_KEY_CINEMATIC_BUTTON, wgettext("Toggle Cinematic"), "keymap_cinematic");
 	this->add_key(GUI_ID_KEY_NOCLIP_BUTTON,    wgettext("Toggle noclip"),    "keymap_noclip");
 	this->add_key(GUI_ID_KEY_RANGE_BUTTON,     wgettext("Range select"),     "keymap_rangeselect");

src/localplayer.cpp

@@ -522,6 +522,7 @@ void LocalPlayer::applyControl(float dtime)
 {
 	// Clear stuff
 	swimming_vertical = false;
+	swimming_pitch = false;
 
 	setPitch(control.pitch);
 	setYaw(control.yaw);
@@ -544,7 +545,7 @@ void LocalPlayer::applyControl(float dtime)
 
 	bool free_move = fly_allowed && g_settings->getBool("free_move");
 	bool fast_move = fast_allowed && g_settings->getBool("fast_move");
-	bool pitch_fly = free_move && g_settings->getBool("pitch_fly");
+	bool pitch_move = (free_move || in_liquid) && g_settings->getBool("pitch_move");
 	// When aux1_descends is enabled the fast key is used to go down, so fast isn't possible
 	bool fast_climb = fast_move && control.aux1 && !g_settings->getBool("aux1_descends");
 	bool continuous_forward = g_settings->getBool("continuous_forward");
@@ -735,10 +736,21 @@ void LocalPlayer::applyControl(float dtime)
 	else
 		incH = incV = movement_acceleration_default * BS * dtime;
 
+	float slip_factor = 1.0f;
+	// if (!free_move)
+	// 	slip_factor = getSlipFactor(env, speedH);
+
+	// Don't sink when swimming in pitch mode
+	if (pitch_move && in_liquid) {
+		v3f controlSpeed = speedH + speedV;
+		if (controlSpeed.getLength() > 0.01f)
+			swimming_pitch = true;
+	}
+
 	// Accelerate to target speed with maximum increment
 	accelerate((speedH + speedV) * physics_override_speed,
-			incH * physics_override_speed, incV * physics_override_speed,
-			pitch_fly);
+			incH * physics_override_speed * slip_factor, incV * physics_override_speed,
+			pitch_move);
 }
 
 v3s16 LocalPlayer::getStandingNodePos()

src/localplayer.h

@@ -57,15 +57,16 @@ public:
 	// This is more stable and defines the maximum speed of the player
 	bool in_liquid_stable;
 	// Gets the viscosity of water to calculate friction
-	u8 liquid_viscosity;
-	bool is_climbing;
-	bool swimming_vertical;
+	u8 liquid_viscosity = 0;
+	bool is_climbing = false;
+	bool swimming_vertical = false;
+	bool swimming_pitch = false;
 
-	float physics_override_speed;
-	float physics_override_jump;
-	float physics_override_gravity;
-	bool physics_override_sneak;
-	bool physics_override_sneak_glitch;
+	float physics_override_speed = 1.0f;
+	float physics_override_jump = 1.0f;
+	float physics_override_gravity = 1.0f;
+	bool physics_override_sneak = true;
+	bool physics_override_sneak_glitch = false;
 	// Temporary option for old move code
 	bool physics_override_new_move;