diff --git a/components/fontloader/fontloader.cpp b/components/fontloader/fontloader.cpp index 40cf965f43..ffd9d82555 100644 --- a/components/fontloader/fontloader.cpp +++ b/components/fontloader/fontloader.cpp @@ -17,6 +17,8 @@ #include +#include + #include #include @@ -626,12 +628,12 @@ namespace Gui { const std::string lowerName = Misc::StringUtils::lowerCase(name); - if (lowerName == Misc::StringUtils::lowerCase(Settings::Manager::getString("default font", "GUI"))) + if (lowerName == Misc::StringUtils::lowerCase(Fallback::Map::getString("Fonts_Font_0"))) return "DefaultFont"; - if (lowerName == Misc::StringUtils::lowerCase(Settings::Manager::getString("scroll font", "GUI"))) - return "ScrollFont"; - if (lowerName == Misc::StringUtils::lowerCase(Settings::Manager::getString("mono font", "GUI"))) + if (lowerName == Misc::StringUtils::lowerCase(Fallback::Map::getString("Fonts_Font_1"))) return "MonoFont"; + if (lowerName == Misc::StringUtils::lowerCase(Fallback::Map::getString("Fonts_Font_2"))) + return "ScrollFont"; return name; } diff --git a/files/openmw.cfg b/files/openmw.cfg index b56f2bbca1..00c1435212 100644 --- a/files/openmw.cfg +++ b/files/openmw.cfg @@ -71,9 +71,9 @@ fallback=Water_UnderwaterColor,012,030,037 fallback=Water_UnderwaterColorWeight,0.85 # fonts -fallback=Fonts_Font_0,magic_cards_regular -fallback=Fonts_Font_1,century_gothic_font_regular -fallback=Fonts_Font_2,daedric_font +fallback=Fonts_Font_0,pelagiad +fallback=Fonts_Font_1,dejavusansmono +fallback=Fonts_Font_2,ayembedt fallback=FontColor_color_normal,202,165,96 fallback=FontColor_color_normal_over,223,201,159 fallback=FontColor_color_normal_pressed,243,237,221 diff --git a/files/openmw.cfg.local b/files/openmw.cfg.local index 94f17d8aec..44525dc486 100644 --- a/files/openmw.cfg.local +++ b/files/openmw.cfg.local @@ -71,9 +71,9 @@ fallback=Water_UnderwaterColor,012,030,037 fallback=Water_UnderwaterColorWeight,0.85 # fonts -fallback=Fonts_Font_0,magic_cards_regular -fallback=Fonts_Font_1,century_gothic_font_regular -fallback=Fonts_Font_2,daedric_font +fallback=Fonts_Font_0,pelagiad +fallback=Fonts_Font_1,dejavusansmono +fallback=Fonts_Font_2,ayembedt fallback=FontColor_color_normal,202,165,96 fallback=FontColor_color_normal_over,223,201,159 fallback=FontColor_color_normal_pressed,243,237,221 diff --git a/files/settings-default.cfg b/files/settings-default.cfg index d42c093f0a..2675004907 100644 --- a/files/settings-default.cfg +++ b/files/settings-default.cfg @@ -234,15 +234,6 @@ color topic specific = 0.45 0.5 0.8 1 # Default to grey color topic exhausted = 0.3 0.3 0.3 1 -# Font used by UI and books -default font = pelagiad - -# Font used by magic scrolls -scroll font = ayembedt - -# Font used by console and debug log -mono font = dejavusansmono - [HUD] # Displays the crosshair or reticle when not in GUI mode.