add airjump and remove unused headers

diff --git a/builtin/client/cheats.lua b/builtin/client/cheats.lua
index e4cace74409263f1887dafa0d3c02c4824051f25..a1e00814ec32856d47ab06288e5ff4e73ea9fb90 100644 (file)
--- a/builtin/client/cheats.lua
+++ b/builtin/client/cheats.lua
@@ -12,6 +12,7 @@ core.cheats = {
                ["NoSlow"] = "no_slow",
                ["JetPack"] = "jetpack",
                ["AntiSlip"] = "antislip",
+               ["AirJump"] = "airjump",
        },
        ["Render"] = {
                ["Xray"] = "xray",

diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt
index 4c9d3f15b9d1893972c674e4ad8d14172d4f0d9a..ab3ceb9e7102460cd0ae74d39e842cfd1bab655e 100644 (file)
--- a/builtin/settingtypes.txt
+++ b/builtin/settingtypes.txt
@@ -2323,3 +2323,5 @@ player_esp_color (PlayerESP Color) v3f 0, 255, 0
 tool_range (Additional Tool Range) int 2
 
 reach (Reach) bool false
+
+airjump (AirJump) bool false

diff --git a/lib/irrlichtmt b/lib/irrlichtmt
new file mode 160000 (submodule)
index 0000000..2dc2846
--- /dev/null
+++ b/lib/irrlichtmt
@@ -0,0 +1 @@
+Subproject commit 2dc2846c3f8ec461c95e3b5e4f8e672f08eb31b5

diff --git a/src/client/content_cao.cpp b/src/client/content_cao.cpp
index 1259fcbd3a075436f22f503c6eba42246abf2e4f..be6608ab64cf2bb7ab863cfdedadd68b6f47b0cf 100644 (file)
--- 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 24a12c35e4802cda4408b8fb3ba8e5cbdd2ff246..e979c5600ace66675344b5e9f50fac64db296b14 100644 (file)
--- 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 e16f15512cc2233321584b447013f6fa978aca0b..3e784523df62f57332e17b4dcfe548202a5ad8bf 100644 (file)
--- 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 f0cfbec5efc7ac22cbf96f1fb7a592ca91bf0776..ee2556b03d17a21e0060f45c505b1f7e403dc1b7 100644 (file)
--- 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,