diff options
| author | Elias Fleckenstein <54945686+EliasFleckenstein03@users.noreply.github.com> | 2021-08-30 17:58:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-30 17:58:18 +0200 |
| commit | f122888148f6efb2f4d28d4de4e4f4221cb29ac0 (patch) | |
| tree | 0f470e22d1768fa135a08e75b1d76e35b6531104 | |
| parent | 35445d24f425c6291a0580b468919ca83de716fd (diff) | |
| parent | f3082146c3d88cfbcc452a8dd4dabe88ad3c7ef8 (diff) | |
| download | dragonfireclient-f122888148f6efb2f4d28d4de4e4f4221cb29ac0.tar.xz | |
Merge pull request #42 from Minetest-j45/master
Add AirJump
| -rw-r--r-- | builtin/client/cheats.lua | 1 | ||||
| -rw-r--r-- | builtin/settingtypes.txt | 2 | ||||
| -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 |
6 files changed, 5 insertions, 3 deletions
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/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, |