diff options
| author | sfan5 <sfan5@live.de> | 2022-01-08 14:53:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-08 14:53:25 +0100 |
| commit | 76dbd0d2d04712dcad4f7c6afecb97fa8d662d6d (patch) | |
| tree | 248b907d2abeda0166d992bfb7b74b61cfe96d8a /src/defaultsettings.cpp | |
| parent | bf22569019749e421e8ffe0a73cff988a9a9c846 (diff) | |
| download | minetest-76dbd0d2d04712dcad4f7c6afecb97fa8d662d6d.tar.gz minetest-76dbd0d2d04712dcad4f7c6afecb97fa8d662d6d.tar.bz2 minetest-76dbd0d2d04712dcad4f7c6afecb97fa8d662d6d.zip | |
Fully remove bitmap font support (#11863)
Freetype is now a build requirement.
Diffstat (limited to 'src/defaultsettings.cpp')
| -rw-r--r-- | src/defaultsettings.cpp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index 47790a552..9e4bb14b5 100644 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp @@ -303,8 +303,7 @@ void set_default_settings() settings->setDefault("main_menu_path", ""); settings->setDefault("serverlist_file", "favoriteservers.json"); -#if USE_FREETYPE - settings->setDefault("freetype", "true"); + // General font settings 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")); @@ -322,14 +321,6 @@ void set_default_settings() settings->setDefault("fallback_font_path", porting::getDataPath("fonts" DIR_DELIM "DroidSansFallbackFull.ttf")); std::string font_size_str = std::to_string(TTF_DEFAULT_FONT_SIZE); -#else - settings->setDefault("freetype", "false"); - settings->setDefault("font_path", porting::getDataPath("fonts" DIR_DELIM "mono_dejavu_sans")); - settings->setDefault("mono_font_path", porting::getDataPath("fonts" DIR_DELIM "mono_dejavu_sans")); - - 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" |