mirror of
https://git.eden-emu.dev/eden-emu/eden.git
synced 2026-06-06 01:13:45 -04:00
Compare commits
2 commits
48219f348c
...
470d43df6d
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
470d43df6d | ||
|
|
fb6330645a |
2 changed files with 23 additions and 8 deletions
|
|
@ -128,25 +128,32 @@ const LanguageEntry& NACP::GetLanguageEntry() const {
|
||||||
case Settings::Language::Russian: return Language::Russian;
|
case Settings::Language::Russian: return Language::Russian;
|
||||||
case Settings::Language::Spanish: return Language::Spanish;
|
case Settings::Language::Spanish: return Language::Spanish;
|
||||||
case Settings::Language::SpanishLatin: return Language::LatinAmericanSpanish;
|
case Settings::Language::SpanishLatin: return Language::LatinAmericanSpanish;
|
||||||
case Settings::Language::Taiwanese: return Language::SimplifiedChinese;
|
case Settings::Language::Taiwanese: return Language::TraditionalChinese;
|
||||||
case Settings::Language::Thai: return Language::Thai;
|
case Settings::Language::Thai: return Language::Thai;
|
||||||
case Settings::Language::Polish: return Language::Polish;
|
case Settings::Language::Polish: return Language::Polish;
|
||||||
default: return Language::AmericanEnglish;
|
default: return Language::AmericanEnglish;
|
||||||
}
|
}
|
||||||
}();
|
}();
|
||||||
|
|
||||||
u32 index = u32(language);
|
const auto index = static_cast<size_t>(language);
|
||||||
|
|
||||||
if (index < language_entries.size() && !language_entries[index].GetApplicationName().empty()) {
|
if (index < language_entries.size() &&
|
||||||
|
!language_entries[index].GetApplicationName().empty()) {
|
||||||
return language_entries[index];
|
return language_entries[index];
|
||||||
}
|
}
|
||||||
|
|
||||||
for (const auto& entry : language_entries) {
|
for (const auto& entry : language_entries) {
|
||||||
if (!entry.GetApplicationName().empty())
|
if (!entry.GetApplicationName().empty()) {
|
||||||
return entry;
|
return entry;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return language_entries.at(static_cast<u8>(Language::AmericanEnglish));
|
if (!language_entries.empty()) {
|
||||||
|
return language_entries.front();
|
||||||
|
}
|
||||||
|
|
||||||
|
static const LanguageEntry empty_entry{};
|
||||||
|
return empty_entry;
|
||||||
}
|
}
|
||||||
|
|
||||||
std::vector<std::string> NACP::GetApplicationNames() const {
|
std::vector<std::string> NACP::GetApplicationNames() const {
|
||||||
|
|
|
||||||
|
|
@ -1144,7 +1144,11 @@ NPad::NpadControllerData& NPad::GetControllerFromNpadIdType(u64 aruid,
|
||||||
npad_id = Core::HID::NpadIdType::Player1;
|
npad_id = Core::HID::NpadIdType::Player1;
|
||||||
}
|
}
|
||||||
const auto npad_index = NpadIdTypeToIndex(npad_id);
|
const auto npad_index = NpadIdTypeToIndex(npad_id);
|
||||||
const auto aruid_index = applet_resource_holder.applet_resource->GetIndexFromAruid(aruid);
|
auto aruid_index = applet_resource_holder.applet_resource->GetIndexFromAruid(aruid);
|
||||||
|
if (aruid_index >= AruidIndexMax) {
|
||||||
|
LOG_ERROR(Service_HID, "Invalid aruid:{:016X}", aruid);
|
||||||
|
aruid_index = 0;
|
||||||
|
}
|
||||||
return controller_data[aruid_index][npad_index];
|
return controller_data[aruid_index][npad_index];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -1155,7 +1159,11 @@ const NPad::NpadControllerData& NPad::GetControllerFromNpadIdType(
|
||||||
npad_id = Core::HID::NpadIdType::Player1;
|
npad_id = Core::HID::NpadIdType::Player1;
|
||||||
}
|
}
|
||||||
const auto npad_index = NpadIdTypeToIndex(npad_id);
|
const auto npad_index = NpadIdTypeToIndex(npad_id);
|
||||||
const auto aruid_index = applet_resource_holder.applet_resource->GetIndexFromAruid(aruid);
|
auto aruid_index = applet_resource_holder.applet_resource->GetIndexFromAruid(aruid);
|
||||||
|
if (aruid_index >= AruidIndexMax) {
|
||||||
|
LOG_ERROR(Service_HID, "Invalid aruid:{:016X}", aruid);
|
||||||
|
aruid_index = 0;
|
||||||
|
}
|
||||||
return controller_data[aruid_index][npad_index];
|
return controller_data[aruid_index][npad_index];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue