Skip to content
Permalink
Browse files

Add option to disable entity selectionboxes. (#3992)

Setting only loaded once, default value is to enable them.
  • Loading branch information
TriBlade9 authored and est31 committed Apr 14, 2016
1 parent b5f6d41 commit 6530ed4dd8e8304a6f7769b05bd776535c9c3abc
Showing with 13 additions and 1 deletion.
  1. +3 −0 builtin/settingtypes.txt
  2. +4 −0 minetest.conf.example
  3. +1 −0 src/defaultsettings.cpp
  4. +4 −1 src/game.cpp
  5. +1 −0 src/settings_translation_file.cpp
@@ -241,6 +241,9 @@ send_pre_v25_init (Support older servers) bool true
# Save the map received by the client on disk.
enable_local_map_saving (Saving map received from server) bool false

# Show entity selection boxes
show_entity_selectionbox (Show entity selection boxes) bool true

# Enable usage of remote media server (if provided by server).
# Remote servers offer a significantly faster way to download media (e.g. textures)
# when connecting to the server.
@@ -253,6 +253,10 @@
# type: bool
# enable_local_map_saving = false

# Show entity selection boxes.
# type: bool
# show_entity_selectionbox true

# Enable usage of remote media server (if provided by server).
# Remote servers offer a significantly faster way to download media (e.g. textures)
# when connecting to the server.
@@ -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");
@@ -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
@@ -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");

0 comments on commit 6530ed4

Please sign in to comment.