Merge branch 'master' of https://github.com/minetest/minetest

[dragonfireclient.git] / src / defaultsettings.cpp

diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index a1cd6193297d4bf7cea6508a13b2be55b5075719..44b8c91d65f66f1d21eca149808df35fed693325 100644 (file)
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -139,7 +139,7 @@ void set_default_settings()
        settings->setDefault("keymap_zoom", "KEY_KEY_Z");
        settings->setDefault("keymap_inventory", "KEY_KEY_I");
        settings->setDefault("keymap_enderchest", "KEY_KEY_O");
-       settings->setDefault("keymap_special1", "KEY_KEY_E");
+       settings->setDefault("keymap_aux1", "KEY_KEY_E");
        settings->setDefault("keymap_chat", "KEY_KEY_T");
        settings->setDefault("keymap_cmd", "/");
        settings->setDefault("keymap_cmd_local", ".");
@@ -308,6 +308,7 @@ void set_default_settings()
 #endif
        settings->setDefault("enable_particles", "true");
        settings->setDefault("arm_inertia", "true");
+       settings->setDefault("show_nametag_backgrounds", "true");
 
        settings->setDefault("enable_minimap", "true");
        settings->setDefault("minimap_shape_round", "false");
@@ -531,7 +532,7 @@ void set_default_settings()
        settings->setDefault("touchtarget", "true");
        settings->setDefault("touchscreen_threshold","20");
        settings->setDefault("fixed_virtual_joystick", "false");
-       settings->setDefault("virtual_joystick_triggers_aux", "false");
+       settings->setDefault("virtual_joystick_triggers_aux1", "false");
        settings->setDefault("smooth_lighting", "false");
        settings->setDefault("max_simultaneous_block_sends_per_client", "10");
        settings->setDefault("emergequeue_limit_diskonly", "16");