CCF_100
/
suyu-mirror
mirror of https://git.suyu.dev/suyu/suyu
1
0
Fork 0
Code Issues Releases Wiki Activity

control_metadata: Move language name array definition to the cpp file 

This was used in two different translation units
(deconstructed_rom_directory and patch_manager). This means we'd be
pointlessly duplicating the whole array twice due to it being defined
within the header.
merge-requests/60/head
Lioncash 2018-09-19 18:55:33 +07:00
parent 0432af5ad1
commit 05d49962b6
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/file_sys/control_metadata.cpp
Unescape Escape View File

@ -8,6 +8,14 @@
namespace FileSys { namespace FileSys {
const std::array<const char*, 15> LANGUAGE_NAMES = {
"AmericanEnglish", "BritishEnglish", "Japanese",
"French", "German", "LatinAmericanSpanish",
"Spanish", "Italian", "Dutch",
"CanadianFrench", "Portugese", "Russian",
"Korean", "Taiwanese", "Chinese",
};
std::string LanguageEntry::GetApplicationName() const { std::string LanguageEntry::GetApplicationName() const {
return Common::StringFromFixedZeroTerminatedBuffer(application_name.data(), 0x200); return Common::StringFromFixedZeroTerminatedBuffer(application_name.data(), 0x200);
} }

7
src/core/file_sys/control_metadata.h
Unescape Escape View File

@ -66,12 +66,7 @@ enum class Language : u8 {
Default = 255, Default = 255,
}; };
static constexpr std::array<const char*, 15> LANGUAGE_NAMES = { extern const std::array<const char*, 15> LANGUAGE_NAMES;
"AmericanEnglish", "BritishEnglish", "Japanese",
"French", "German", "LatinAmericanSpanish",
"Spanish", "Italian", "Dutch",
"CanadianFrench", "Portugese", "Russian",
"Korean", "Taiwanese", "Chinese"};
// A class representing the format used by NX metadata files, typically named Control.nacp. // A class representing the format used by NX metadata files, typically named Control.nacp.
// These store application name, dev name, title id, and other miscellaneous data. // These store application name, dev name, title id, and other miscellaneous data.