CCF_100
/
yuzu-mirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Style: Addressed some comments

master
Subv 2014-12-20 23:33:33 +07:00
parent a7cc7972de
commit a1b9b80a55
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/core/file_sys/archive_systemsavedata.cpp
Unescape Escape View File

@ -16,9 +16,14 @@
namespace FileSys { namespace FileSys {
static std::string GetSystemSaveDataPath(const std::string& mount_point, u64 save_id) {
u32 save_high = static_cast<u32>((save_id >> 32) & 0xFFFFFFFF);
u32 save_low = static_cast<u32>(save_id & 0xFFFFFFFF);
return Common::StringFromFormat("%s%08X/%08X/", mount_point.c_str(), save_low, save_high);
}
Archive_SystemSaveData::Archive_SystemSaveData(const std::string& mount_point, u64 save_id) Archive_SystemSaveData::Archive_SystemSaveData(const std::string& mount_point, u64 save_id)
: DiskArchive(Common::StringFromFormat("%s%08X/%08X/", mount_point.c_str(), : DiskArchive(GetSystemSaveDataPath(mount_point, save_id)) {
static_cast<u32>(save_id & 0xFFFFFFFF), static_cast<u32>((save_id >> 32) & 0xFFFFFFFF))) {
LOG_INFO(Service_FS, "Directory %s set as SystemSaveData.", this->mount_point.c_str()); LOG_INFO(Service_FS, "Directory %s set as SystemSaveData.", this->mount_point.c_str());
} }

9
src/core/hle/service/cfg_u.cpp
Unescape Escape View File

@ -59,9 +59,9 @@ static std::array<u8, CONFIG_SAVEFILE_SIZE> cfg_config_file_buffer = { };
/// TODO(Subv): Find out what this actually is /// TODO(Subv): Find out what this actually is
/// Thanks Normmatt for providing this information /// Thanks Normmatt for providing this information
static const u8 STEREO_CAMERA_SETTINGS[32] = { static const std::array<float, 8> STEREO_CAMERA_SETTINGS = {
0x00, 0x00, 0x78, 0x42, 0x00, 0x80, 0x90, 0x43, 0x9A, 0x99, 0x99, 0x42, 0xEC, 0x51, 0x38, 0x42, 62.0f, 289.0f, 76.80000305175781f, 46.08000183105469f,
0x00, 0x00, 0x20, 0x41, 0x00, 0x00, 0xA0, 0x40, 0xEC, 0x51, 0x5E, 0x42, 0x5C, 0x8F, 0xAC, 0x41 10.0f, 5.0f, 55.58000183105469f, 21.56999969482422f
}; };
// TODO(Link Mauve): use a constexpr once MSVC starts supporting it. // TODO(Link Mauve): use a constexpr once MSVC starts supporting it.
@ -293,7 +293,8 @@ ResultCode FormatConfig() {
SaveFileConfig* config = reinterpret_cast<SaveFileConfig*>(cfg_config_file_buffer.data()); SaveFileConfig* config = reinterpret_cast<SaveFileConfig*>(cfg_config_file_buffer.data());
config->data_entries_offset = 0x455C; config->data_entries_offset = 0x455C;
// Insert the default blocks // Insert the default blocks
res = CreateConfigInfoBlk(0x00050005, 0x20, 0xE, STEREO_CAMERA_SETTINGS); res = CreateConfigInfoBlk(0x00050005, 0x20, 0xE,
reinterpret_cast<u8 const*>(STEREO_CAMERA_SETTINGS.data()));
if (!res.IsSuccess()) if (!res.IsSuccess())
return res; return res;
res = CreateConfigInfoBlk(0x00090001, 0x8, 0xE, reinterpret_cast<u8 const*>(&CONSOLE_UNIQUE_ID)); res = CreateConfigInfoBlk(0x00090001, 0x8, 0xE, reinterpret_cast<u8 const*>(&CONSOLE_UNIQUE_ID));