Fix codestyle since CSM Camera API

[dragonfireclient.git] / src / defaultsettings.cpp

diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 396b69b3a0671852041e072ebeae53af24150213..c583220bdbaa5868a4fa180c0368b5232d984d13 100644 (file)
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -39,6 +39,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("sound_volume", "0.8");
        settings->setDefault("enable_mesh_cache", "false");
        settings->setDefault("mesh_generation_interval", "0");
+       settings->setDefault("meshgen_block_cache_size", "20");
        settings->setDefault("enable_vbo", "true");
        settings->setDefault("free_move", "false");
        settings->setDefault("fast_move", "false");
@@ -72,12 +73,18 @@ void set_default_settings(Settings *settings)
        settings->setDefault("keymap_special1", "KEY_KEY_E");
        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_console", "KEY_F10");
        settings->setDefault("keymap_rangeselect", "KEY_KEY_R");
        settings->setDefault("keymap_freemove", "KEY_KEY_K");
        settings->setDefault("keymap_fastmove", "KEY_KEY_J");
        settings->setDefault("keymap_noclip", "KEY_KEY_H");
+       settings->setDefault("keymap_hotbar_next", "KEY_KEY_N");
+       settings->setDefault("keymap_hotbar_previous", "KEY_KEY_B");
+       settings->setDefault("keymap_mute", "KEY_KEY_M");
+       settings->setDefault("keymap_increase_volume", "");
+       settings->setDefault("keymap_decrease_volume", "");
        settings->setDefault("keymap_cinematic", "");
        settings->setDefault("keymap_toggle_hud", "KEY_F1");
        settings->setDefault("keymap_toggle_chat", "KEY_F2");
@@ -107,6 +114,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("show_debug", "true");
 #endif
        settings->setDefault("fsaa", "0");
+       settings->setDefault("undersampling", "0");
        settings->setDefault("enable_fog", "true");
        settings->setDefault("fog_start", "0.4");
        settings->setDefault("3d_mode", "none");
@@ -118,6 +126,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("viewing_range", "100");
        settings->setDefault("screenW", "800");
        settings->setDefault("screenH", "600");
+       settings->setDefault("autosave_screensize", "true");
        settings->setDefault("fullscreen", "false");
        settings->setDefault("fullscreen_bpp", "24");
        settings->setDefault("vsync", "false");
@@ -168,7 +177,6 @@ void set_default_settings(Settings *settings)
 
        // Effects
        settings->setDefault("directional_colored_fog", "true");
-       settings->setDefault("view_bobbing", "true");
        settings->setDefault("inventory_items_animations", "false");
        settings->setDefault("mip_map", "false");
        settings->setDefault("anisotropic_filter", "false");
@@ -202,6 +210,8 @@ void set_default_settings(Settings *settings)
        settings->setDefault("always_fly_fast", "true");
        settings->setDefault("continuous_forward", "false");
        settings->setDefault("enable_joysticks", "false");
+       settings->setDefault("joystick_id", "0");
+       settings->setDefault("joystick_type", "");
        settings->setDefault("repeat_joystick_button_time", "0.17");
        settings->setDefault("joystick_frustum_sensitivity", "170");
 
@@ -260,7 +270,6 @@ void set_default_settings(Settings *settings)
        settings->setDefault("creative_mode", "false");
        settings->setDefault("show_statusline_on_connect", "true");
        settings->setDefault("enable_damage", "true");
-       settings->setDefault("give_initial_stuff", "false");
        settings->setDefault("default_password", "");
        settings->setDefault("default_privs", "interact, shout");
        settings->setDefault("enable_pvp", "true");
@@ -332,10 +341,10 @@ void set_default_settings(Settings *settings)
        // Mapgen
        settings->setDefault("mg_name", "v7");
        settings->setDefault("water_level", "1");
+       settings->setDefault("mapgen_limit", "31000");
        settings->setDefault("chunksize", "5");
        settings->setDefault("mg_flags", "dungeons");
        settings->setDefault("fixed_map_seed", "");
-       settings->setDefault("map_generation_limit", "31000");
        settings->setDefault("max_block_generate_distance", "7");
        settings->setDefault("enable_mapgen_debug_info", "false");
 
@@ -347,6 +356,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("server_description", "");
 
        settings->setDefault("high_precision_fpu", "true");
+       settings->setDefault("enable_console", "false");
 
 #ifdef __ANDROID__
        settings->setDefault("screenW", "0");