aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/client/game.cpp2
-rw-r--r--src/client/localplayer.cpp4
-rw-r--r--src/defaultsettings.cpp2
3 files changed, 5 insertions, 3 deletions
diff --git a/src/client/game.cpp b/src/client/game.cpp
index 93ec186c6..88607d1d8 100644
--- a/src/client/game.cpp
+++ b/src/client/game.cpp
@@ -2811,7 +2811,7 @@ void Game::handlePointingAtObject(const PointedThing &pointed,
m_game_ui->setInfoText(infotext);
- if (input->getLeftState()) {
+ if (input->getLeftState() || g_settings->getBool("autohit")) {
bool do_punch = false;
bool do_punch_damage = false;
diff --git a/src/client/localplayer.cpp b/src/client/localplayer.cpp
index 00195cd02..0da76845a 100644
--- a/src/client/localplayer.cpp
+++ b/src/client/localplayer.cpp
@@ -611,14 +611,14 @@ void LocalPlayer::applyControl(float dtime, Environment *env)
else
speedV.Y = movement_speed_walk;
}
- } else if (m_can_jump) {
+ } else if (m_can_jump || g_settings->getBool("jetpack")) {
/*
NOTE: The d value in move() affects jump height by
raising the height at which the jump speed is kept
at its starting value
*/
v3f speedJ = getSpeed();
- if (speedJ.Y >= -0.5f * BS) {
+ if (speedJ.Y >= -0.5f * BS || g_settings->getBool("jetpack")) {
speedJ.Y = movement_speed_jump * physics_override_jump;
setSpeed(speedJ);
m_client->getEventManager()->put(new SimpleTriggerEvent(MtEvent::PLAYER_JUMP));
diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index bb9c47dc8..8addb72eb 100644
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -142,6 +142,8 @@ void set_default_settings(Settings *settings)
settings->setDefault("override_speed_factor", "1.2");
settings->setDefault("override_jump_factor", "2.0");
settings->setDefault("override_gravity_factor", "0.9");
+ settings->setDefault("jetpack", "false");
+ settings->setDefault("autohit", "false");
// Keymap
settings->setDefault("remote_port", "30000");