fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[XAM] Fixed importing savefiles from different games (at least partially)

Browse Source
This commit is contained in:
Gliniak
2023-01-06 16:35:40 +01:00
parent 40f6b5b3ac
commit 668244adb7
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/xenia/kernel/xam/content_manager.cc
View File

@@ -16,6 +16,7 @@
#include "xenia/base/filesystem.h" #include "xenia/base/filesystem.h"
#include "xenia/base/string.h" #include "xenia/base/string.h"
#include "xenia/kernel/kernel_state.h" #include "xenia/kernel/kernel_state.h"
#include "xenia/kernel/xam/user_profile.h"
#include "xenia/kernel/xfile.h" #include "xenia/kernel/xfile.h"
#include "xenia/kernel/xobject.h" #include "xenia/kernel/xobject.h"
#include "xenia/vfs/devices/host_path_device.h" #include "xenia/vfs/devices/host_path_device.h"
@@ -179,8 +180,8 @@ X_RESULT ContentManager::ReadContentHeaderFile(const std::string_view file_name,
auto content_type_directory = fmt::format("{:08X}", content_type); auto content_type_directory = fmt::format("{:08X}", content_type);
auto header_file_path = root_path_ / title_id_str / auto header_file_path = root_path_ / title_id_str /
kGameContentHeaderDirName / kGameContentHeaderDirName / content_type_directory /
content_type_directory / file_name; file_name;
constexpr uint32_t header_size = sizeof(XCONTENT_AGGREGATE_DATA); constexpr uint32_t header_size = sizeof(XCONTENT_AGGREGATE_DATA);
if (std::filesystem::exists(header_file_path)) { if (std::filesystem::exists(header_file_path)) {
@@ -201,6 +202,11 @@ X_RESULT ContentManager::ReadContentHeaderFile(const std::string_view file_name,
} }
fclose(file); fclose(file);
std::memcpy(&data, buffer.data(), buffer.size()); std::memcpy(&data, buffer.data(), buffer.size());
// It only reads basic info, however importing savefiles
// usually requires title_id to be provided
// Kinda simple workaround for that, but still assumption
data.title_id = title_id;
data.unk134 = kernel_state_->user_profile(uint32_t(0))->xuid();
return X_STATUS_SUCCESS; return X_STATUS_SUCCESS;
} }
return X_STATUS_NO_SUCH_FILE; return X_STATUS_NO_SUCH_FILE;