aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorElias Fleckenstein <eliasfleckenstein@web.de>2020-10-12 18:12:04 +0200
committerElias Fleckenstein <eliasfleckenstein@web.de>2020-10-12 18:12:04 +0200
commit80f416d51449ffc6907f7e2b6d1ef935abee5611 (patch)
treea01aec2298837cc80e1b5554589a1712747728f5 /src
parentcb1915efa780292c7221bb14f38976967d7bcdab (diff)
downloaddragonfireclient-80f416d51449ffc6907f7e2b6d1ef935abee5611.tar.xz
Added AttachmentFloat
Diffstat (limited to 'src')
-rw-r--r--src/client/camera.cpp2
-rw-r--r--src/defaultsettings.cpp1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/client/camera.cpp b/src/client/camera.cpp
index abc55e4b7..c9e8fab6a 100644
--- a/src/client/camera.cpp
+++ b/src/client/camera.cpp
@@ -340,7 +340,7 @@ void Camera::update(LocalPlayer* player, f32 frametime, f32 busytime, f32 tool_r
// mods expect the player head to be at the parent's position
// plus eye height.
if (player->getParent())
- player_position = player->getParent()->getPosition();
+ player_position = player->getParent()->getPosition() + v3f(0, g_settings->getBool("float_above_parent") ? BS : 0, 0);
// Smooth the camera movement when the player instantly moves upward due to stepheight.
// To smooth the 'not touching_ground' stepheight, smoothing is necessary when jumping
diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 91d9d6be6..5e23ffc39 100644
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -94,6 +94,7 @@ void set_default_settings(Settings *settings)
settings->setDefault("enable_tracers", "false");
settings->setDefault("enable_esp", "false");
settings->setDefault("no_slow", "false");
+ settings->setDefault("float_above_parent", "false");
// Keymap
settings->setDefault("remote_port", "30000");