MultiCraft
/
MultiCraft2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update MultiCraft Font

master
Maksim 2022-05-26 19:32:25 +03:00
parent 383e6ac053
commit c71df1d735
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
fonts/MultiCraftFont.ttf
View File

Binary file not shown.

2
po/ja/minetest.po
View File

@ -1101,7 +1101,7 @@ msgstr "ワールドが存在しません: "
#. When in doubt, test your translation. #. When in doubt, test your translation.
#: src/client/fontengine.cpp #: src/client/fontengine.cpp
msgid "needs_fallback_font" msgid "needs_fallback_font"
msgstr "yes" msgstr "no"
#: src/client/game.cpp #: src/client/game.cpp
msgid "" msgid ""

21
src/defaultsettings.cpp
View File

@ -302,16 +302,17 @@ void set_default_settings()
#if USE_FREETYPE #if USE_FREETYPE
settings->setDefault("freetype", "true"); settings->setDefault("freetype", "true");
#if !defined(__ANDROID__) && !defined(__IOS__) #if !defined(__ANDROID__) && !defined(__APPLE__)
settings->setDefault("font_path", porting::getDataPath("fonts" DIR_DELIM "Arimo-Regular.ttf")); 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_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", 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_path_bold_italic", porting::getDataPath("fonts" DIR_DELIM "Arimo-BoldItalic.ttf"));
#else #else
settings->setDefault("font_path", porting::getDataPath("fonts" DIR_DELIM "MultiCraftFont.ttf")); std::string MultiCraftFont = porting::getDataPath("fonts" DIR_DELIM "MultiCraftFont.ttf");
settings->setDefault("font_path_italic", porting::getDataPath("fonts" DIR_DELIM "MultiCraftFont.ttf")); settings->setDefault("font_path", MultiCraftFont);
settings->setDefault("font_path_bold", porting::getDataPath("fonts" DIR_DELIM "MultiCraftFont.ttf")); settings->setDefault("font_path_italic", MultiCraftFont);
settings->setDefault("font_path_bold_italic", porting::getDataPath("fonts" DIR_DELIM "MultiCraftFont.ttf")); settings->setDefault("font_path_bold", MultiCraftFont);
settings->setDefault("font_path_bold_italic", MultiCraftFont);
#endif #endif
settings->setDefault("font_bold", "false"); settings->setDefault("font_bold", "false");
settings->setDefault("font_italic", "false"); settings->setDefault("font_italic", "false");
@ -332,11 +333,11 @@ void set_default_settings()
settings->setDefault("fallback_font_path", "/system/fonts/DroidSans.ttf"); settings->setDefault("fallback_font_path", "/system/fonts/DroidSans.ttf");
#endif #endif
#ifdef __IOS__ #ifdef __IOS__
settings->setDefault("mono_font_path", g_settings->get("font_path")); settings->setDefault("mono_font_path", MultiCraftFont);
settings->setDefault("mono_font_path_italic", g_settings->get("font_path")); settings->setDefault("mono_font_path_italic", MultiCraftFont);
settings->setDefault("mono_font_path_bold", g_settings->get("font_path")); settings->setDefault("mono_font_path_bold", MultiCraftFont);
settings->setDefault("mono_font_path_bold_italic", g_settings->get("font_path")); settings->setDefault("mono_font_path_bold_italic", MultiCraftFont);
settings->setDefault("fallback_font_path", g_settings->get("font_path")); settings->setDefault("fallback_font_path", MultiCraftFont);
#endif #endif
#endif #endif