diff options
| author | Zach Hilman <zachhilman@gmail.com> | 2018-07-28 18:35:02 +0200 |
|---|---|---|
| committer | Zach Hilman <zachhilman@gmail.com> | 2018-08-07 05:06:33 +0200 |
| commit | 5927cf0e177d1804bcc0d9f95aa3fe1c4d0f6201 (patch) | |
| tree | 889f9111aa75d73b620e332b4949cd8c304692b6 /src/core | |
| parent | Avoid parsing RomFS to directory in NCA (diff) | |
| download | yuzu-5927cf0e177d1804bcc0d9f95aa3fe1c4d0f6201.tar yuzu-5927cf0e177d1804bcc0d9f95aa3fe1c4d0f6201.tar.gz yuzu-5927cf0e177d1804bcc0d9f95aa3fe1c4d0f6201.tar.bz2 yuzu-5927cf0e177d1804bcc0d9f95aa3fe1c4d0f6201.tar.lz yuzu-5927cf0e177d1804bcc0d9f95aa3fe1c4d0f6201.tar.xz yuzu-5927cf0e177d1804bcc0d9f95aa3fe1c4d0f6201.tar.zst yuzu-5927cf0e177d1804bcc0d9f95aa3fe1c4d0f6201.zip | |
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/file_sys/control_metadata.h | 2 | ||||
| -rw-r--r-- | src/core/loader/deconstructed_rom_directory.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/core/file_sys/control_metadata.h b/src/core/file_sys/control_metadata.h index 9fc02612a..6582cc240 100644 --- a/src/core/file_sys/control_metadata.h +++ b/src/core/file_sys/control_metadata.h @@ -62,7 +62,7 @@ enum class Language : u8 { Chinese = 14, }; -static std::array<std::string, 15> LANGUAGE_NAMES = { +static constexpr std::array<const char*, 15> LANGUAGE_NAMES = { "AmericanEnglish", "BritishEnglish", "Japanese", "French", "German", "LatinAmericanSpanish", "Spanish", "Italian", "Dutch", diff --git a/src/core/loader/deconstructed_rom_directory.cpp b/src/core/loader/deconstructed_rom_directory.cpp index cc88a44b6..4a028250b 100644 --- a/src/core/loader/deconstructed_rom_directory.cpp +++ b/src/core/loader/deconstructed_rom_directory.cpp @@ -25,7 +25,7 @@ AppLoader_DeconstructedRomDirectory::AppLoader_DeconstructedRomDirectory(FileSys // Icon FileSys::VirtualFile icon_file = nullptr; for (const auto& language : FileSys::LANGUAGE_NAMES) { - icon_file = dir->GetFile("icon_" + language + ".dat"); + icon_file = dir->GetFile("icon_" + std::string(language) + ".dat"); if (icon_file != nullptr) { icon_data = icon_file->ReadAllBytes(); break; |