Fix bone-attached entities (#10015)

[oweals/minetest.git] / src / defaultsettings.cpp

diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index b6b1ce1f2a9a5b1789a80d0c6a248946b96409ae..abb6593b7515fa4cb38b26b1c0d20a798e916cc2 100644 (file)
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -80,7 +80,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("keymap_chat", "KEY_KEY_T");
        settings->setDefault("keymap_cmd", "/");
        settings->setDefault("keymap_cmd_local", ".");
-       settings->setDefault("keymap_minimap", "KEY_F9");
+       settings->setDefault("keymap_minimap", "KEY_KEY_V");
        settings->setDefault("keymap_console", "KEY_F10");
        settings->setDefault("keymap_rangeselect", "KEY_KEY_R");
        settings->setDefault("keymap_freemove", "KEY_KEY_K");
@@ -103,7 +103,7 @@ void set_default_settings(Settings *settings)
 #endif
        settings->setDefault("keymap_toggle_debug", "KEY_F5");
        settings->setDefault("keymap_toggle_profiler", "KEY_F6");
-       settings->setDefault("keymap_camera_mode", "KEY_F7");
+       settings->setDefault("keymap_camera_mode", "KEY_KEY_C");
        settings->setDefault("keymap_screenshot", "KEY_F12");
        settings->setDefault("keymap_increase_viewing_range_min", "+");
        settings->setDefault("keymap_decrease_viewing_range_min", "-");
@@ -321,8 +321,12 @@ void set_default_settings(Settings *settings)
 
        std::string font_size_str = std::to_string(DEFAULT_FONT_SIZE);
 #endif
+       // General font settings
        settings->setDefault("font_size", font_size_str);
        settings->setDefault("mono_font_size", font_size_str);
+       settings->setDefault("chat_font_size", "0"); // Default "font_size"
+
+       // ContentDB
        settings->setDefault("contentdb_url", "https://content.minetest.net");
 #ifdef __ANDROID__
        settings->setDefault("contentdb_flag_blacklist", "nonfree, android_default");
@@ -334,6 +338,9 @@ void set_default_settings(Settings *settings)
        // Server
        settings->setDefault("disable_escape_sequences", "false");
        settings->setDefault("strip_color_codes", "false");
+#if USE_PROMETHEUS
+       settings->setDefault("prometheus_listener_address", "127.0.0.1:30000");
+#endif
 
        // Network
        settings->setDefault("enable_ipv6", "true");
@@ -397,6 +404,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("remote_media", "");
        settings->setDefault("debug_log_level", "action");
        settings->setDefault("debug_log_size_max", "50");
+       settings->setDefault("chat_log_level", "error");
        settings->setDefault("emergequeue_limit_total", "512");
        settings->setDefault("emergequeue_limit_diskonly", "64");
        settings->setDefault("emergequeue_limit_generate", "64");
@@ -443,6 +451,7 @@ void set_default_settings(Settings *settings)
 
        settings->setDefault("high_precision_fpu", "true");
        settings->setDefault("enable_console", "false");
+       settings->setDefault("screen_dpi", "72");
 
        // Altered settings for macOS
 #if defined(__MACH__) && defined(__APPLE__)
@@ -456,7 +465,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("screen_h", "0");
        settings->setDefault("fullscreen", "true");
        settings->setDefault("touchtarget", "true");
-       settings->setDefault("TMPFolder", porting::getDataPath("tmp" DIR_DELIM));
+       settings->setDefault("TMPFolder", porting::path_cache);
        settings->setDefault("touchscreen_threshold","20");
        settings->setDefault("fixed_virtual_joystick", "false");
        settings->setDefault("virtual_joystick_triggers_aux", "false");
@@ -478,8 +487,8 @@ void set_default_settings(Settings *settings)
        settings->setDefault("curl_verify_cert","false");
 
        // Apply settings according to screen size
-       float x_inches = ((double) porting::getDisplaySize().X /
-                       (160 * porting::getDisplayDensity()));
+       float x_inches = (float) porting::getDisplaySize().X /
+                       (160.f * porting::getDisplayDensity());
 
        if (x_inches < 3.7f) {
                settings->setDefault("hud_scaling", "0.6");
@@ -495,8 +504,5 @@ void set_default_settings(Settings *settings)
                settings->setDefault("mono_font_size", "14");
        }
        // Tablets >= 6.0 use non-Android defaults for these settings
-#else
-       settings->setDefault("screen_dpi", "72");
 #endif
 }
-