diff options
| author | TriBlade9 <triblade9@mail.com> | 2016-04-14 02:15:41 -0700 |
|---|---|---|
| committer | est31 <MTest31@outlook.com> | 2016-04-14 11:20:11 +0200 |
| commit | 6530ed4dd8e8304a6f7769b05bd776535c9c3abc (patch) | |
| tree | 1b88fef629af0b904089d5ee20d55cac9d108553 /src | |
| parent | b5f6d41eedca983a98470fdb97b5732e08802d24 (diff) | |
| download | minetest-6530ed4dd8e8304a6f7769b05bd776535c9c3abc.tar.gz minetest-6530ed4dd8e8304a6f7769b05bd776535c9c3abc.tar.bz2 minetest-6530ed4dd8e8304a6f7769b05bd776535c9c3abc.zip | |
Add option to disable entity selectionboxes. (#3992)
Setting only loaded once, default value is to enable them.
Diffstat (limited to 'src')
| -rw-r--r-- | src/defaultsettings.cpp | 1 | ||||
| -rw-r--r-- | src/game.cpp | 5 | ||||
| -rw-r--r-- | src/settings_translation_file.cpp | 1 |
3 files changed, 6 insertions, 1 deletions
diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index e00ff1489..d048721e0 100644 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp @@ -150,6 +150,7 @@ void set_default_settings(Settings *settings) settings->setDefault("desynchronize_mapblock_texture_animation", "true"); settings->setDefault("hud_hotbar_max_width", "1.0"); settings->setDefault("enable_local_map_saving", "false"); + settings->setDefault("show_entity_selectionbox", "true"); settings->setDefault("mip_map", "false"); settings->setDefault("anisotropic_filter", "false"); diff --git a/src/game.cpp b/src/game.cpp index c1f80c5a1..d513517b7 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -329,6 +329,8 @@ PointedThing getPointedThing(Client *client, Hud *hud, const v3f &player_positio std::vector<aabb3f> *selectionboxes = hud->getSelectionBoxes(); selectionboxes->clear(); + static const bool show_entity_selectionbox = g_settings->getBool("show_entity_selectionbox"); + selected_object = NULL; INodeDefManager *nodedef = client->getNodeDefManager(); @@ -342,7 +344,8 @@ PointedThing getPointedThing(Client *client, Hud *hud, const v3f &player_positio camera_position, shootline); if (selected_object != NULL) { - if (selected_object->doShowSelectionBox()) { + if (show_entity_selectionbox && + selected_object->doShowSelectionBox()) { aabb3f *selection_box = selected_object->getSelectionBox(); // Box should exist because object was // returned in the first place diff --git a/src/settings_translation_file.cpp b/src/settings_translation_file.cpp index 77fd6c682..beb56d9f3 100644 --- a/src/settings_translation_file.cpp +++ b/src/settings_translation_file.cpp @@ -102,6 +102,7 @@ fake_function() { gettext("Whether to support older servers before protocol version 25.\nEnable if you want to connect to 0.4.12 servers and before.\nServers starting with 0.4.13 will work, 0.4.12-dev servers may work.\nDisabling this option will protect your password better."); gettext("Saving map received from server"); gettext("Save the map received by the client on disk."); + gettext("Show entity selection boxes"); gettext("Connect to external media server"); gettext("Enable usage of remote media server (if provided by server).\nRemote servers offer a significantly faster way to download media (e.g. textures)\nwhen connecting to the server."); gettext("Serverlist URL"); |