diff options
author | Tobias <thm.frey@gmail.com> | 2018-09-11 03:31:01 +0200 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2018-09-11 03:31:01 +0200 |
commit | 3bac3051fc03846f5461628ba6a1b1f19851657c (patch) | |
tree | f2ab2fb5e6c37c89ac52fee43d2425d12c3e1e47 /src/core/hle/service/ns/pl_u.cpp | |
parent | Port #4141 from citra: Joystick hotplug support (#1275) (diff) | |
download | yuzu-3bac3051fc03846f5461628ba6a1b1f19851657c.tar yuzu-3bac3051fc03846f5461628ba6a1b1f19851657c.tar.gz yuzu-3bac3051fc03846f5461628ba6a1b1f19851657c.tar.bz2 yuzu-3bac3051fc03846f5461628ba6a1b1f19851657c.tar.lz yuzu-3bac3051fc03846f5461628ba6a1b1f19851657c.tar.xz yuzu-3bac3051fc03846f5461628ba6a1b1f19851657c.tar.zst yuzu-3bac3051fc03846f5461628ba6a1b1f19851657c.zip |
Diffstat (limited to 'src/core/hle/service/ns/pl_u.cpp')
-rw-r--r-- | src/core/hle/service/ns/pl_u.cpp | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/src/core/hle/service/ns/pl_u.cpp b/src/core/hle/service/ns/pl_u.cpp index 878bbe439..77f635ae2 100644 --- a/src/core/hle/service/ns/pl_u.cpp +++ b/src/core/hle/service/ns/pl_u.cpp @@ -2,6 +2,13 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include <FontChineseSimplified.ttf.h> +#include <FontChineseTraditional.ttf.h> +#include <FontExtendedChineseSimplified.ttf.h> +#include <FontKorean.ttf.h> +#include <FontNintendoExtended.ttf.h> +#include <FontStandard.ttf.h> + #include "common/common_paths.h" #include "common/file_util.h" #include "core/core.h" @@ -218,7 +225,24 @@ PL_U::PL_U() : ServiceFramework("pl:u") { file.ReadBytes(shared_font->data(), shared_font->size()); BuildSharedFontsRawRegions(*shared_font); } else { - LOG_WARNING(Service_NS, "Unable to load shared font: {}", filepath); + LOG_WARNING(Service_NS, + "Shared Font file missing. Loading open source replacement from memory"); + + const std::vector<std::vector<u8>> open_source_shared_fonts_ttf = { + {std::begin(FontChineseSimplified), std::end(FontChineseSimplified)}, + {std::begin(FontChineseTraditional), std::end(FontChineseTraditional)}, + {std::begin(FontExtendedChineseSimplified), + std::end(FontExtendedChineseSimplified)}, + {std::begin(FontNintendoExtended), std::end(FontNintendoExtended)}, + {std::begin(FontStandard), std::end(FontStandard)}, + }; + + for (const std::vector<u8>& font_ttf : open_source_shared_fonts_ttf) { + const FontRegion region{static_cast<u32>(offset + 8), + static_cast<u32>(font_ttf.size())}; + EncryptSharedFont(font_ttf, *shared_font, offset); + SHARED_FONT_REGIONS.push_back(region); + } } } } |