aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/client/game.cpp7
-rw-r--r--src/defaultsettings.cpp5
2 files changed, 5 insertions, 7 deletions
diff --git a/src/client/game.cpp b/src/client/game.cpp
index 18707306c..816f8f307 100644
--- a/src/client/game.cpp
+++ b/src/client/game.cpp
@@ -2288,10 +2288,9 @@ void Game::processPlayerInteraction(f32 dtime, bool show_hud, bool show_debug)
const ItemDefinition &selected_def = selected_item.getDefinition(itemdef_manager);
f32 d = getToolRange(selected_def, hand_item.getDefinition(itemdef_manager));
- if (g_settings->getBool("increase_tool_range"))
- d += 2;
- if (g_settings->getBool("increase_tool_range_plus"))
- d = 1000;
+
+ if (g_settings->getBool("reach"))
+ d += g_settings->getU16("tool_range");
core::line3d<f32> shootline;
diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 580db99f1..aceb8f63b 100644
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -85,8 +85,7 @@ void set_default_settings(Settings *settings)
settings->setDefault("freecam", "false");
settings->setDefault("killaura", "false");
settings->setDefault("no_hurt_cam", "false");
- settings->setDefault("increase_tool_range", "true");
- settings->setDefault("increase_tool_range_plus", "false");
+ settings->setDefault("reach", "true");
settings->setDefault("hud_flags_bypass", "true");
settings->setDefault("antiknockback", "false");
settings->setDefault("entity_speed", "false");
@@ -116,7 +115,7 @@ void set_default_settings(Settings *settings)
settings->setDefault("enable_node_tracers", "false");
settings->setDefault("entity_esp_color", "(255, 255, 255)");
settings->setDefault("player_esp_color", "(0, 255, 0)");
- settings->setDefault("scaffold", "false"); // For now
+ settings->setDefault("tool_range", "2");
// Keymap
settings->setDefault("remote_port", "30000");