Use pause_fps_max also on multiplayer

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

diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index cf9101e34c8ecfa02d14d2e859be078e9482e557..9cd17ac91a87776889f1c7f20dd5378c338385f1 100644 (file)
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -64,7 +64,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("doubletap_jump", "false");
        settings->setDefault("always_fly_fast", "true");
        settings->setDefault("directional_colored_fog", "true");
-       settings->setDefault("tooltip_show_delay", "400");      
+       settings->setDefault("tooltip_show_delay", "400");
 
        // Some (temporary) keys for debugging
        settings->setDefault("keymap_print_debug_stacks", "KEY_KEY_P");
@@ -133,7 +133,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("anisotropic_filter", "false");
        settings->setDefault("bilinear_filter", "false");
        settings->setDefault("trilinear_filter", "false");
-       settings->setDefault("preload_item_visuals", "true");
+       settings->setDefault("preload_item_visuals", "false");
        settings->setDefault("enable_bumpmapping", "false");
        settings->setDefault("enable_parallax_occlusion", "false");
        settings->setDefault("generate_normalmaps", "false");
@@ -154,6 +154,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("curl_timeout", "5000");
        settings->setDefault("curl_parallel_limit", "8");
        settings->setDefault("curl_file_download_timeout", "300000");
+       settings->setDefault("curl_verify_cert", "true");
 
        settings->setDefault("enable_remote_media_server", "true");
 
@@ -261,9 +262,6 @@ void set_default_settings(Settings *settings)
        settings->setDefault("chunksize", "5");
        settings->setDefault("mg_flags", "");
 
-       settings->setDefault("mgmath_generator", "mandelbox");
-
-
        // IPv6
        settings->setDefault("enable_ipv6", "true");
        settings->setDefault("ipv6_server", "false");
@@ -278,6 +276,39 @@ void set_default_settings(Settings *settings)
        settings->setDefault("high_precision_fpu", "true");
 
        settings->setDefault("language", "");
+
+#ifdef __ANDROID__
+       settings->setDefault("screenW", "0");
+       settings->setDefault("screenH", "0");
+       settings->setDefault("enable_shaders", "false");
+       settings->setDefault("fullscreen", "true");
+       settings->setDefault("enable_particles", "false");
+       settings->setDefault("video_driver", "ogles1");
+       settings->setDefault("touchtarget", "true");
+       settings->setDefault("main_menu_script","/sdcard/Minetest/builtin/mainmenu/init_android.lua");
+       settings->setDefault("TMPFolder","/sdcard/Minetest/tmp/");
+       settings->setDefault("touchscreen_threshold","20");
+       settings->setDefault("smooth_lighting", "false");
+       settings->setDefault("max_simultaneous_block_sends_per_client", "3");
+       settings->setDefault("emergequeue_limit_diskonly", "8");
+       settings->setDefault("emergequeue_limit_generate", "8");
+       settings->setDefault("preload_item_visuals", "false");
+
+       settings->setDefault("viewing_range_nodes_max", "50");
+       settings->setDefault("viewing_range_nodes_min", "20");
+       settings->setDefault("inventory_image_hack", "false");
+
+       //check for device with small screen
+       float x_inches = ((double) porting::getDisplaySize().X /
+                       (160 * porting::getDisplayDensity()));
+       if (x_inches  < 3.5) {
+               settings->setDefault("gui_scaling", "0.6");
+       }
+       else if (x_inches < 4.5) {
+               settings->setDefault("gui_scaling", "0.7");
+       }
+       settings->setDefault("curl_verify_cert","false");
+#endif
 }
 
 void late_init_default_settings(Settings* settings)