diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/content_cao.cpp | 1 | ||||
| -rw-r--r-- | src/client/localplayer.cpp | 2 | ||||
| -rw-r--r-- | src/defaultsettings.cpp | 1 | ||||
| -rw-r--r-- | src/gui/guiScene.cpp | 1 |
4 files changed, 2 insertions, 3 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 diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index e16f15512..3e784523d 100644 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp @@ -123,6 +123,7 @@ void set_default_settings() settings->setDefault("tool_range", "2"); settings->setDefault("scaffold", "false"); settings->setDefault("killaura", "false"); + settings->setDefault("airjump", "false"); // Keymap settings->setDefault("remote_port", "30000"); diff --git a/src/gui/guiScene.cpp b/src/gui/guiScene.cpp index f0cfbec5e..ee2556b03 100644 --- a/src/gui/guiScene.cpp +++ b/src/gui/guiScene.cpp @@ -21,7 +21,6 @@ with this program; if not, write to the Free Software Foundation, Inc., #include <SViewFrustum.h> #include <IAnimatedMeshSceneNode.h> -#include <ILightSceneNode.h> #include "porting.h" GUIScene::GUIScene(gui::IGUIEnvironment *env, scene::ISceneManager *smgr, |