diff options
| author |  bunnei | 2018-10-24 16:28:56 -0400 |
|---|---|---|
| committer |  GitHub | 2018-10-24 16:28:56 -0400 |
| commit | d14ba122e248c9036037f124f25a4ba067ee19bf (patch) | |
| tree | 1c7ade5c594dfd7993812620764910dbd68891cc /src/core | |
| parent | Merge pull request #1560 from lioncash/unused (diff) | |
| parent | aoc_u: Make use of previously-unused CheckAOCTitleIDMatchesBase() function (diff) | |
| download | yuzu-d14ba122e248c9036037f124f25a4ba067ee19bf.tar.gz yuzu-d14ba122e248c9036037f124f25a4ba067ee19bf.tar.xz yuzu-d14ba122e248c9036037f124f25a4ba067ee19bf.zip | |
Merge pull request #1562 from lioncash/aoc
aoc_u: Make use of previously-unused CheckAOCTitleIDMatchesBase() function
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/hle/service/aoc/aoc_u.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/hle/service/aoc/aoc_u.cpp b/src/core/hle/service/aoc/aoc_u.cpp index 428069df2..54305cf05 100644 --- a/src/core/hle/service/aoc/aoc_u.cpp +++ b/src/core/hle/service/aoc/aoc_u.cpp | |||
| @@ -24,8 +24,8 @@ namespace Service::AOC { | |||
| 24 | constexpr u64 DLC_BASE_TITLE_ID_MASK = 0xFFFFFFFFFFFFE000; | 24 | constexpr u64 DLC_BASE_TITLE_ID_MASK = 0xFFFFFFFFFFFFE000; |
| 25 | constexpr u64 DLC_BASE_TO_AOC_ID = 0x1000; | 25 | constexpr u64 DLC_BASE_TO_AOC_ID = 0x1000; |
| 26 | 26 | ||
| 27 | static bool CheckAOCTitleIDMatchesBase(u64 base, u64 aoc) { | 27 | static bool CheckAOCTitleIDMatchesBase(u64 title_id, u64 base) { |
| 28 | return (aoc & DLC_BASE_TITLE_ID_MASK) == base; | 28 | return (title_id & DLC_BASE_TITLE_ID_MASK) == base; |
| 29 | } | 29 | } |
| 30 | 30 | ||
| 31 | static std::vector<u64> AccumulateAOCTitleIDs() { | 31 | static std::vector<u64> AccumulateAOCTitleIDs() { |
| @@ -74,7 +74,7 @@ void AOC_U::CountAddOnContent(Kernel::HLERequestContext& ctx) { | |||
| 74 | const auto current = Core::System::GetInstance().CurrentProcess()->GetTitleID(); | 74 | const auto current = Core::System::GetInstance().CurrentProcess()->GetTitleID(); |
| 75 | rb.Push<u32>(static_cast<u32>( | 75 | rb.Push<u32>(static_cast<u32>( |
| 76 | std::count_if(add_on_content.begin(), add_on_content.end(), | 76 | std::count_if(add_on_content.begin(), add_on_content.end(), |
| 77 | [¤t](u64 tid) { return (tid & DLC_BASE_TITLE_ID_MASK) == current; }))); | 77 | [current](u64 tid) { return CheckAOCTitleIDMatchesBase(tid, current); }))); |
| 78 | } | 78 | } |
| 79 | 79 | ||
| 80 | void AOC_U::ListAddOnContent(Kernel::HLERequestContext& ctx) { | 80 | void AOC_U::ListAddOnContent(Kernel::HLERequestContext& ctx) { |