diff options
| author | Elias Fleckenstein <eliasfleckenstein@web.de> | 2020-07-18 10:37:54 +0200 |
|---|---|---|
| committer | Elias Fleckenstein <eliasfleckenstein@web.de> | 2020-07-18 10:37:54 +0200 |
| commit | f22339ed891afddca53f7442c63aedd7aecc566d (patch) | |
| tree | dcb6de9b55e89d21ac6cdc566ea0b7c69042340d | |
| parent | 408e39a1d291d52e07387f83a305d6b069296260 (diff) | |
| download | dragonfireclient-f22339ed891afddca53f7442c63aedd7aecc566d.tar.xz | |
Removed fast killaura
| -rw-r--r-- | builtin/settingtypes.txt | 5 | ||||
| -rw-r--r-- | src/client/game.cpp | 11 | ||||
| -rw-r--r-- | src/defaultsettings.cpp | 1 |
3 files changed, 3 insertions, 14 deletions
diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt index 87c00cab0..4137625cc 100644 --- a/builtin/settingtypes.txt +++ b/builtin/settingtypes.txt @@ -2148,7 +2148,7 @@ priv_bypass (Make the Client think it has all privs) bool true fastdig (Fast Dig) bool false -prevent_natural_damage (Prevent Natural Damage e.g Fall Damage) bool true +prevent_natural_damage (Prevent Fall Damage) bool true freecam (Move around freely) bool false @@ -2158,7 +2158,6 @@ no_hurt_cam (No Hurt Cam) bool false increase_tool_range (Increase Tool Range) bool true -killaura_fast (Enable fast Killaura) bool true - hud_flags_bypass (Enable HUD Flags Bypass) bool true +antiknockback (Anti Knockback) bool false diff --git a/src/client/game.cpp b/src/client/game.cpp index 7c2249296..adb870994 100644 --- a/src/client/game.cpp +++ b/src/client/game.cpp @@ -2363,10 +2363,6 @@ PointedThing Game::updatePointedThing( const NodeDefManager *nodedef = map.getNodeDefManager(); if (g_settings->getBool("killaura")) { - LocalPlayer *player = env.getLocalPlayer(); - v3f player_pos = player->getPosition(); - ItemStack selected_item, hand_item; - const ItemStack &tool_item = player->getWieldedItem(&selected_item, &hand_item); std::vector<DistanceSortedActiveObject> allObjects; env.getActiveObjects(shootline.start, shootline.getLength() + 10.0f, allObjects); const v3f line_vector = shootline.getVector(); @@ -2382,12 +2378,7 @@ PointedThing Game::updatePointedThing( aabb3f offsetted_box(selection_box.MinEdge + pos, selection_box.MaxEdge + pos); boxLineCollision(offsetted_box, shootline.start, line_vector, &intersection, &normal); PointedThing pointed(id, intersection, normal, (intersection - shootline.start).getLengthSQ()); - if (g_settings->getBool("killaura_fast")) - client->interact(INTERACT_START_DIGGING, pointed); - else { - runData.selected_object = obj; - handlePointingAtObject(pointed, tool_item, player_pos, false); - } + client->interact(INTERACT_START_DIGGING, pointed); break; } } diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index 1dde62ff1..2ec23b9d8 100644 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp @@ -74,7 +74,6 @@ void set_default_settings(Settings *settings) settings->setDefault("killaura", "falses"); settings->setDefault("no_hurt_cam", "false"); settings->setDefault("increase_tool_range", "true"); - settings->setDefault("killaura_fast", "true"); settings->setDefault("hud_flags_bypass", "true"); settings->setDefault("antiknockback", "false"); |