AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 22:27:41 +00:00
Code Issues Projects Releases Wiki Activity

Char16 refactor and GuiSys bug fixes

Browse Source
This commit is contained in:
Jack Andersen
2017-01-23 21:41:33 -10:00
parent f8853fbccf
commit 7a60151d3e
31 changed files with 262 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
DataSpec/DNAMP1/STRG.hpp
View File

@@ -16,8 +16,8 @@ struct STRG : ISTRG
DECL_YAML
Delete expl;
void _read(athena::io::IStreamReader& reader);
std::vector<std::pair<FourCC, std::vector<std::wstring>>> langs;
std::unordered_map<FourCC, std::vector<std::wstring>*> langMap;
std::vector<std::pair<FourCC, std::vector<std::u16string>>> langs;
std::unordered_map<FourCC, std::vector<std::u16string>*> langMap;
inline int32_t lookupIdx(const std::string& name) const {return -1;}
@@ -36,15 +36,15 @@ struct STRG : ISTRG
{
auto search = langMap.find(lang);
if (search != langMap.end())
return hecl::WideToUTF8(search->second->at(idx));
return hecl::Char16ToUTF8(search->second->at(idx));
return std::string();
}
inline std::wstring getUTF16(const FourCC& lang, size_t idx) const
inline std::u16string getUTF16(const FourCC& lang, size_t idx) const
{
auto search = langMap.find(lang);
if (search != langMap.end())
return search->second->at(idx);
return std::wstring();
return std::u16string();
}
inline hecl::SystemString getSystemString(const FourCC& lang, size_t idx) const
{
@@ -53,7 +53,7 @@ struct STRG : ISTRG
#if HECL_UCS2
return search->second->at(idx);
#else
return hecl::WideToUTF8(search->second->at(idx));
return hecl::Char16ToUTF8(search->second->at(idx));
#endif
return hecl::SystemString();
}