Fix pathfinder bugs: returning nil frequently, broken A*, jump through solid nodes...

[minetest.git] / src / defaultsettings.cpp

diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 7756bc45d8011e2d3e2c22b6ec2209291a78ce7e..b6e385a90cecfed673afba324dc88bc6e5cc9059 100644 (file)
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -24,6 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "config.h"
 #include "constants.h"
 #include "porting.h"
+#include "mapgen/mapgen.h" // Mapgen::setDefaultSettings
 #include "util/string.h"
 
 void set_default_settings(Settings *settings)
@@ -292,9 +293,17 @@ void set_default_settings(Settings *settings)
 #if USE_FREETYPE
        settings->setDefault("freetype", "true");
        settings->setDefault("font_path", porting::getDataPath("fonts" DIR_DELIM "Arimo-Regular.ttf"));
+       settings->setDefault("font_path_italic", porting::getDataPath("fonts" DIR_DELIM "Arimo-Italic.ttf"));
+       settings->setDefault("font_path_bold", porting::getDataPath("fonts" DIR_DELIM "Arimo-Bold.ttf"));
+       settings->setDefault("font_path_bold_italic", porting::getDataPath("fonts" DIR_DELIM "Arimo-BoldItalic.ttf"));
+       settings->setDefault("font_bold", "false");
+       settings->setDefault("font_italic", "false");
        settings->setDefault("font_shadow", "1");
        settings->setDefault("font_shadow_alpha", "127");
        settings->setDefault("mono_font_path", porting::getDataPath("fonts" DIR_DELIM "Cousine-Regular.ttf"));
+       settings->setDefault("mono_font_path_italic", porting::getDataPath("fonts" DIR_DELIM "Cousine-Italic.ttf"));
+       settings->setDefault("mono_font_path_bold", porting::getDataPath("fonts" DIR_DELIM "Cousine-Bold.ttf"));
+       settings->setDefault("mono_font_path_bold_italic", porting::getDataPath("fonts" DIR_DELIM "Cousine-BoldItalic.ttf"));
        settings->setDefault("fallback_font_path", porting::getDataPath("fonts" DIR_DELIM "DroidSansFallbackFull.ttf"));
 
        settings->setDefault("fallback_font_shadow", "1");
@@ -385,6 +394,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("ignore_world_load_errors", "false");
        settings->setDefault("remote_media", "");
        settings->setDefault("debug_log_level", "action");
+       settings->setDefault("debug_log_size_max", "50");
        settings->setDefault("emergequeue_limit_total", "512");
        settings->setDefault("emergequeue_limit_diskonly", "64");
        settings->setDefault("emergequeue_limit_generate", "64");
@@ -417,11 +427,10 @@ void set_default_settings(Settings *settings)
        settings->setDefault("water_level", "1");
        settings->setDefault("mapgen_limit", "31000");
        settings->setDefault("chunksize", "5");
-       settings->setDefault("mg_flags", "caves,dungeons,light,decorations,biomes");
        settings->setDefault("fixed_map_seed", "");
        settings->setDefault("max_block_generate_distance", "8");
-       settings->setDefault("projecting_dungeons", "true");
        settings->setDefault("enable_mapgen_debug_info", "false");
+       Mapgen::setDefaultSettings(settings);
 
        // Server list announcing
        settings->setDefault("server_announce", "false");
@@ -489,10 +498,3 @@ void set_default_settings(Settings *settings)
 #endif
 }
 
-void override_default_settings(Settings *settings, Settings *from)
-{
-       std::vector<std::string> names = from->getNames();
-       for (const auto &name : names) {
-               settings->setDefault(name, from->get(name));
-       }
-}