citra-emu
/
citra-canary
Archived
1
0
Fork 0
Code

boss: Add some missing property IDs and fix file enumeration. (#7322)

This commit is contained in:
Steveice10 2024-01-07 09:38:41 -08:00 committed by GitHub
parent 0165012ba4
commit 7bacb78ce3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/core/hle/service/boss/online_service.cpp
View File

@ -229,9 +229,10 @@ std::vector<FileSys::Entry> OnlineService::GetBossExtDataFiles(
do { do {
boss_files.resize(boss_files.size() + files_to_read); boss_files.resize(boss_files.size() + files_to_read);
entry_count = dir->Read(files_to_read, boss_files.data() + (i++ * files_to_read)); entry_count = dir->Read(files_to_read, boss_files.data() + (i++ * files_to_read));
} while (files_to_read <= entry_count); } while (entry_count > files_to_read);
boss_files.resize(i * files_to_read + entry_count); // Resize to trim off unused entries from the final read.
boss_files.resize((i - 1) * files_to_read + entry_count);
return boss_files; return boss_files;
} }
@ -485,6 +486,7 @@ Result OnlineService::SendProperty(const u16 id, const u32 size, Kernel::MappedB
std::visit(overload{[&](u8& cur_prop) { read_pod(cur_prop); }, std::visit(overload{[&](u8& cur_prop) { read_pod(cur_prop); },
[&](u16& cur_prop) { read_pod(cur_prop); }, [&](u16& cur_prop) { read_pod(cur_prop); },
[&](u32& cur_prop) { read_pod(cur_prop); }, [&](u32& cur_prop) { read_pod(cur_prop); },
[&](u64& cur_prop) { read_pod(cur_prop); },
[&](std::vector<u8>& cur_prop) { read_vector(cur_prop); }, [&](std::vector<u8>& cur_prop) { read_vector(cur_prop); },
[&](std::vector<u32>& cur_prop) { read_vector(cur_prop); }}, [&](std::vector<u32>& cur_prop) { read_vector(cur_prop); }},
prop); prop);
@ -521,6 +523,7 @@ Result OnlineService::ReceiveProperty(const u16 id, const u32 size, Kernel::Mapp
std::visit(overload{[&](u8& cur_prop) { write_pod(cur_prop); }, std::visit(overload{[&](u8& cur_prop) { write_pod(cur_prop); },
[&](u16& cur_prop) { write_pod(cur_prop); }, [&](u16& cur_prop) { write_pod(cur_prop); },
[&](u32& cur_prop) { write_pod(cur_prop); }, [&](u32& cur_prop) { write_pod(cur_prop); },
[&](u64& cur_prop) { write_pod(cur_prop); },
[&](std::vector<u8>& cur_prop) { write_vector(cur_prop); }, [&](std::vector<u8>& cur_prop) { write_vector(cur_prop); },
[&](std::vector<u32>& cur_prop) { write_vector(cur_prop); }}, [&](std::vector<u32>& cur_prop) { write_vector(cur_prop); }},
prop); prop);

21
src/core/hle/service/boss/online_service.h
View File

@ -113,7 +113,7 @@ struct BossSSData {
std::array<u8, URL_SIZE> url; std::array<u8, URL_SIZE> url;
}; };
using BossTaskProperty = std::variant<u8, u16, u32, std::vector<u8>, std::vector<u32>>; using BossTaskProperty = std::variant<u8, u16, u32, u64, std::vector<u8>, std::vector<u32>>;
struct BossTaskProperties { struct BossTaskProperties {
bool task_result; bool task_result;
std::map<PropertyID, BossTaskProperty> properties{ std::map<PropertyID, BossTaskProperty> properties{
@ -145,6 +145,25 @@ struct BossTaskProperties {
{static_cast<PropertyID>(0x1A), u8()}, {static_cast<PropertyID>(0x1A), u8()},
{static_cast<PropertyID>(0x1B), u32()}, {static_cast<PropertyID>(0x1B), u32()},
{static_cast<PropertyID>(0x1C), u32()}, {static_cast<PropertyID>(0x1C), u32()},
{static_cast<PropertyID>(0x1D), u8()},
{static_cast<PropertyID>(0x1E), u8()},
{static_cast<PropertyID>(0x1F), u8()},
{static_cast<PropertyID>(0x20), u8()},
{static_cast<PropertyID>(0x21), u8()},
{static_cast<PropertyID>(0x22), u8()},
{static_cast<PropertyID>(0x23), u32()},
{static_cast<PropertyID>(0x24), u8()},
{static_cast<PropertyID>(0x25), u32()},
{static_cast<PropertyID>(0x26), u32()},
{static_cast<PropertyID>(0x27), u32()},
{static_cast<PropertyID>(0x28), u64()},
{static_cast<PropertyID>(0x29), u64()},
{static_cast<PropertyID>(0x2A), u32()},
{static_cast<PropertyID>(0x2B), u32()},
{static_cast<PropertyID>(0x2C), u8()},
{static_cast<PropertyID>(0x2D), u16()},
{static_cast<PropertyID>(0x2E), u16()},
{static_cast<PropertyID>(0x2F), std::vector<u8>(0x40)},
{PropertyID::TotalTasks, u16()}, {PropertyID::TotalTasks, u16()},
{PropertyID::TaskIdList, std::vector<u8>(TASKIDLIST_SIZE)}, {PropertyID::TaskIdList, std::vector<u8>(TASKIDLIST_SIZE)},
{static_cast<PropertyID>(0x3B), u32()}, {static_cast<PropertyID>(0x3B), u32()},