aboutsummaryrefslogtreecommitdiff
path: root/src/client
diff options
context:
space:
mode:
authorMinetest-j45 <janscheresmonesma@gmail.com>2021-08-30 16:45:27 +0100
committerMinetest-j45 <janscheresmonesma@gmail.com>2021-08-30 16:45:27 +0100
commita3925db22672e5111f542a49d76bc72df2072edf (patch)
tree3faeb7d5aae4f69d7d95f2526bffbea54c6fa846 /src/client
parent7824a4956bf489b4e2cc35e0c97272eee06be6ba (diff)
downloaddragonfireclient-a3925db22672e5111f542a49d76bc72df2072edf.tar.xz
add airjump and remove unused headers
Diffstat (limited to 'src/client')
-rw-r--r--src/client/content_cao.cpp1
-rw-r--r--src/client/localplayer.cpp2
2 files changed, 1 insertions, 2 deletions
diff --git a/src/client/content_cao.cpp b/src/client/content_cao.cpp
index 1259fcbd3..be6608ab6 100644
--- a/src/client/content_cao.cpp
+++ b/src/client/content_cao.cpp
@@ -20,7 +20,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "content_cao.h"
#include <IBillboardSceneNode.h>
#include <ICameraSceneNode.h>
-#include <ITextSceneNode.h>
#include <IMeshManipulator.h>
#include <IAnimatedMeshSceneNode.h>
#include "client/client.h"
diff --git a/src/client/localplayer.cpp b/src/client/localplayer.cpp
index 24a12c35e..e979c5600 100644
--- a/src/client/localplayer.cpp
+++ b/src/client/localplayer.cpp
@@ -340,7 +340,7 @@ void LocalPlayer::move(f32 dtime, Environment *env, f32 pos_max_d,
Player is allowed to jump when this is true.
*/
bool touching_ground_was = touching_ground;
- touching_ground = result.touching_ground;
+ touching_ground = result.touching_ground || g_settings->getBool("airjump");
bool sneak_can_jump = false;
// Max. distance (X, Z) over border for sneaking determined by collision box