From a3925db22672e5111f542a49d76bc72df2072edf Mon Sep 17 00:00:00 2001
From: Minetest-j45 <janscheresmonesma@gmail.com>
Date: Mon, 30 Aug 2021 16:45:27 +0100
Subject: add airjump and remove unused headers

---
 builtin/client/cheats.lua  | 1 +
 builtin/settingtypes.txt   | 2 ++
 lib/irrlichtmt             | 1 +
 src/client/content_cao.cpp | 1 -
 src/client/localplayer.cpp | 2 +-
 src/defaultsettings.cpp    | 1 +
 src/gui/guiScene.cpp       | 1 -
 7 files changed, 6 insertions(+), 3 deletions(-)
 create mode 160000 lib/irrlichtmt

diff --git a/builtin/client/cheats.lua b/builtin/client/cheats.lua
index e4cace744..a1e00814e 100644
--- 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 4c9d3f15b..ab3ceb9e7 100644
--- 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
index 000000000..2dc2846c3
--- /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 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,
-- 
cgit v1.2.3