yuzu-emu
/
yuzu-mainline
Archived
1
0
Fork 0
Code

Merge pull request #1562 from lioncash/aoc 

aoc_u: Make use of previously-unused CheckAOCTitleIDMatchesBase() function
This commit is contained in:
bunnei 2018-10-24 16:28:56 -04:00 committed by GitHub
parent 2eff8336f4 a3d1ede25f
commit d14ba122e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/hle/service/aoc/aoc_u.cpp
View File

@ -24,8 +24,8 @@ namespace Service::AOC {
constexpr u64 DLC_BASE_TITLE_ID_MASK = 0xFFFFFFFFFFFFE000; constexpr u64 DLC_BASE_TITLE_ID_MASK = 0xFFFFFFFFFFFFE000;
constexpr u64 DLC_BASE_TO_AOC_ID = 0x1000; constexpr u64 DLC_BASE_TO_AOC_ID = 0x1000;
static bool CheckAOCTitleIDMatchesBase(u64 base, u64 aoc) { static bool CheckAOCTitleIDMatchesBase(u64 title_id, u64 base) {
return (aoc & DLC_BASE_TITLE_ID_MASK) == base; return (title_id & DLC_BASE_TITLE_ID_MASK) == base;
} }
static std::vector<u64> AccumulateAOCTitleIDs() { static std::vector<u64> AccumulateAOCTitleIDs() {
@ -74,7 +74,7 @@ void AOC_U::CountAddOnContent(Kernel::HLERequestContext& ctx) {
const auto current = Core::System::GetInstance().CurrentProcess()->GetTitleID(); const auto current = Core::System::GetInstance().CurrentProcess()->GetTitleID();
rb.Push<u32>(static_cast<u32>( rb.Push<u32>(static_cast<u32>(
std::count_if(add_on_content.begin(), add_on_content.end(), std::count_if(add_on_content.begin(), add_on_content.end(),
[&current](u64 tid) { return (tid & DLC_BASE_TITLE_ID_MASK) == current; }))); [current](u64 tid) { return CheckAOCTitleIDMatchesBase(tid, current); })));
} }
void AOC_U::ListAddOnContent(Kernel::HLERequestContext& ctx) { void AOC_U::ListAddOnContent(Kernel::HLERequestContext& ctx) {