diff options
| author | 2023-05-10 17:57:25 -0400 | |
|---|---|---|
| committer | 2023-07-21 10:56:07 -0400 | |
| commit | 8e151460265f04c7bf4a981b5f97f252a0444c27 (patch) | |
| tree | dc02219effed841c9a2c20b013db9390ed3981c6 /src/core/hle/service | |
| parent | per_game: Remove general tab (diff) | |
| download | yuzu-8e151460265f04c7bf4a981b5f97f252a0444c27.tar.gz yuzu-8e151460265f04c7bf4a981b5f97f252a0444c27.tar.xz yuzu-8e151460265f04c7bf4a981b5f97f252a0444c27.zip | |
configure_system: Implement with for loop
Diffstat (limited to 'src/core/hle/service')
| -rw-r--r-- | src/core/hle/service/ns/ns.cpp | 2 | ||||
| -rw-r--r-- | src/core/hle/service/set/set.cpp | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/core/hle/service/ns/ns.cpp b/src/core/hle/service/ns/ns.cpp index 376067a95..91c5a2182 100644 --- a/src/core/hle/service/ns/ns.cpp +++ b/src/core/hle/service/ns/ns.cpp | |||
| @@ -409,7 +409,7 @@ ResultVal<u8> IApplicationManagerInterface::GetApplicationDesiredLanguage( | |||
| 409 | 409 | ||
| 410 | // Get language code from settings | 410 | // Get language code from settings |
| 411 | const auto language_code = | 411 | const auto language_code = |
| 412 | Set::GetLanguageCodeFromIndex(Settings::values.language_index.GetValue()); | 412 | Set::GetLanguageCodeFromIndex(static_cast<s32>(Settings::values.language_index.GetValue())); |
| 413 | 413 | ||
| 414 | // Convert to application language, get priority list | 414 | // Convert to application language, get priority list |
| 415 | const auto application_language = ConvertToApplicationLanguage(language_code); | 415 | const auto application_language = ConvertToApplicationLanguage(language_code); |
diff --git a/src/core/hle/service/set/set.cpp b/src/core/hle/service/set/set.cpp index f5788b481..83f888c54 100644 --- a/src/core/hle/service/set/set.cpp +++ b/src/core/hle/service/set/set.cpp | |||
| @@ -93,7 +93,8 @@ void GetAvailableLanguageCodesImpl(HLERequestContext& ctx, std::size_t max_entri | |||
| 93 | } | 93 | } |
| 94 | 94 | ||
| 95 | void GetKeyCodeMapImpl(HLERequestContext& ctx) { | 95 | void GetKeyCodeMapImpl(HLERequestContext& ctx) { |
| 96 | const auto language_code = available_language_codes[Settings::values.language_index.GetValue()]; | 96 | const auto language_code = |
| 97 | available_language_codes[static_cast<s32>(Settings::values.language_index.GetValue())]; | ||
| 97 | const auto key_code = | 98 | const auto key_code = |
| 98 | std::find_if(language_to_layout.cbegin(), language_to_layout.cend(), | 99 | std::find_if(language_to_layout.cbegin(), language_to_layout.cend(), |
| 99 | [=](const auto& element) { return element.first == language_code; }); | 100 | [=](const auto& element) { return element.first == language_code; }); |
| @@ -162,7 +163,7 @@ void SET::GetQuestFlag(HLERequestContext& ctx) { | |||
| 162 | 163 | ||
| 163 | IPC::ResponseBuilder rb{ctx, 3}; | 164 | IPC::ResponseBuilder rb{ctx, 3}; |
| 164 | rb.Push(ResultSuccess); | 165 | rb.Push(ResultSuccess); |
| 165 | rb.Push(static_cast<u32>(Settings::values.quest_flag.GetValue())); | 166 | rb.Push(static_cast<s32>(Settings::values.quest_flag.GetValue())); |
| 166 | } | 167 | } |
| 167 | 168 | ||
| 168 | void SET::GetLanguageCode(HLERequestContext& ctx) { | 169 | void SET::GetLanguageCode(HLERequestContext& ctx) { |
| @@ -170,7 +171,8 @@ void SET::GetLanguageCode(HLERequestContext& ctx) { | |||
| 170 | 171 | ||
| 171 | IPC::ResponseBuilder rb{ctx, 4}; | 172 | IPC::ResponseBuilder rb{ctx, 4}; |
| 172 | rb.Push(ResultSuccess); | 173 | rb.Push(ResultSuccess); |
| 173 | rb.PushEnum(available_language_codes[Settings::values.language_index.GetValue()]); | 174 | rb.PushEnum( |
| 175 | available_language_codes[static_cast<s32>(Settings::values.language_index.GetValue())]); | ||
| 174 | } | 176 | } |
| 175 | 177 | ||
| 176 | void SET::GetRegionCode(HLERequestContext& ctx) { | 178 | void SET::GetRegionCode(HLERequestContext& ctx) { |
| @@ -178,7 +180,7 @@ void SET::GetRegionCode(HLERequestContext& ctx) { | |||
| 178 | 180 | ||
| 179 | IPC::ResponseBuilder rb{ctx, 3}; | 181 | IPC::ResponseBuilder rb{ctx, 3}; |
| 180 | rb.Push(ResultSuccess); | 182 | rb.Push(ResultSuccess); |
| 181 | rb.Push(Settings::values.region_index.GetValue()); | 183 | rb.Push(static_cast<u32>(Settings::values.region_index.GetValue())); |
| 182 | } | 184 | } |
| 183 | 185 | ||
| 184 | void SET::GetKeyCodeMap(HLERequestContext& ctx) { | 186 | void SET::GetKeyCodeMap(HLERequestContext& ctx) { |