Inventory: Send dirty lists where appropriate (#8742)

[dragonfireclient.git] / src / defaultsettings.cpp

diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 1df6dccb62460623da5ba27538b1ae853c76566f..b6ab7c9a0cce80622755cfdcd2a0bf1855d9d41e 100644 (file)
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -17,6 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
+#include <IrrCompileConfig.h>
 #include "settings.h"
 #include "porting.h"
 #include "filesys.h"
@@ -82,7 +83,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("keymap_console", "KEY_F10");
        settings->setDefault("keymap_rangeselect", "KEY_KEY_R");
        settings->setDefault("keymap_freemove", "KEY_KEY_K");
-       settings->setDefault("keymap_pitchmove", "KEY_KEY_L");
+       settings->setDefault("keymap_pitchmove", "KEY_KEY_P");
        settings->setDefault("keymap_fastmove", "KEY_KEY_J");
        settings->setDefault("keymap_noclip", "KEY_KEY_H");
        settings->setDefault("keymap_hotbar_next", "KEY_KEY_N");
@@ -182,7 +183,15 @@ void set_default_settings(Settings *settings)
        settings->setDefault("lighting_boost_spread", "0.2");
        settings->setDefault("texture_path", "");
        settings->setDefault("shader_path", "");
+#if ENABLE_GLES
+#ifdef _IRR_COMPILE_WITH_OGLES1_
+       settings->setDefault("video_driver", "ogles1");
+#else
+       settings->setDefault("video_driver", "ogles2");
+#endif
+#else
        settings->setDefault("video_driver", "opengl");
+#endif
        settings->setDefault("cinematic", "false");
        settings->setDefault("camera_smoothing", "0");
        settings->setDefault("cinematic_camera_smoothing", "0.7");
@@ -217,7 +226,11 @@ void set_default_settings(Settings *settings)
        settings->setDefault("texture_clean_transparent", "false");
        settings->setDefault("texture_min_size", "64");
        settings->setDefault("ambient_occlusion_gamma", "2.2");
+#if ENABLE_GLES
+       settings->setDefault("enable_shaders", "false");
+#else
        settings->setDefault("enable_shaders", "true");
+#endif
        settings->setDefault("enable_particles", "true");
        settings->setDefault("arm_inertia", "true");
 
@@ -343,6 +356,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("kick_msg_crash", "This server has experienced an internal error. You will now be disconnected.");
        settings->setDefault("ask_reconnect_on_crash", "false");
 
+       settings->setDefault("chat_message_format", "<@name> @message");
        settings->setDefault("profiler_print_interval", "0");
        settings->setDefault("active_object_send_range_blocks", "4");
        settings->setDefault("active_block_range", "3");
@@ -355,7 +369,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("csm_restriction_noderange", "0");
        settings->setDefault("max_clearobjects_extra_loaded_blocks", "4096");
        settings->setDefault("time_speed", "72");
-       settings->setDefault("world_start_time", "5250");
+       settings->setDefault("world_start_time", "6125");
        settings->setDefault("server_unload_unused_data_timeout", "29");
        settings->setDefault("max_objects_per_block", "64");
        settings->setDefault("server_map_save_interval", "5.3");
@@ -374,7 +388,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("emergequeue_limit_total", "512");
        settings->setDefault("emergequeue_limit_diskonly", "64");
        settings->setDefault("emergequeue_limit_generate", "64");
-       settings->setDefault("num_emerge_threads", "0");
+       settings->setDefault("num_emerge_threads", "1");
        settings->setDefault("secure.enable_security", "true");
        settings->setDefault("secure.trusted_mods", "");
        settings->setDefault("secure.http_mods", "");
@@ -429,11 +443,9 @@ void set_default_settings(Settings *settings)
 #ifdef __ANDROID__
        settings->setDefault("screen_w", "0");
        settings->setDefault("screen_h", "0");
-       settings->setDefault("enable_shaders", "false");
        settings->setDefault("fullscreen", "true");
-       settings->setDefault("video_driver", "ogles1");
        settings->setDefault("touchtarget", "true");
-       settings->setDefault("TMPFolder","/sdcard/" PROJECT_NAME_C "/tmp/");
+       settings->setDefault("TMPFolder", porting::getDataPath("tmp" DIR_DELIM));
        settings->setDefault("touchscreen_threshold","20");
        settings->setDefault("fixed_virtual_joystick", "false");
        settings->setDefault("virtual_joystick_triggers_aux", "false");
@@ -450,8 +462,8 @@ void set_default_settings(Settings *settings)
        settings->setDefault("server_map_save_interval", "15");
        settings->setDefault("client_mapblock_limit", "1000");
        settings->setDefault("active_block_range", "2");
-       settings->setDefault("chunksize", "5");
        settings->setDefault("viewing_range", "50");
+       settings->setDefault("leaves_style", "simple");
        settings->setDefault("curl_verify_cert","false");
 
        // Apply settings according to screen size