diff options
| author | Anthony <Helios747@users.noreply.github.com> | 2017-06-09 11:36:46 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-09 11:36:46 -0700 |
| commit | 0a6933137109eb26b2efe4795a8a0ee30a9ecdc5 (patch) | |
| tree | 1e19cff0528453f6382eaa5ac5f5c30f049078e0 /Source/Core/DiscIO/VolumeDirectory.cpp | |
| parent | eb50533201082bbda88c3d773b337e400c6cfe41 (diff) | |
| parent | 2578a3553bbc817a5c07be5f285c3c3e6c14ad55 (diff) | |
Merge pull request #5585 from JosJuice/volumedirectory-minor-fixes
VolumeDirectory: Minor fixes
Diffstat (limited to 'Source/Core/DiscIO/VolumeDirectory.cpp')
| -rw-r--r-- | Source/Core/DiscIO/VolumeDirectory.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/Core/DiscIO/VolumeDirectory.cpp b/Source/Core/DiscIO/VolumeDirectory.cpp index f6f603d8ff..a205f0126a 100644 --- a/Source/Core/DiscIO/VolumeDirectory.cpp +++ b/Source/Core/DiscIO/VolumeDirectory.cpp @@ -333,7 +333,7 @@ bool VolumeDirectory::SetApploader(const std::string& apploader) { m_apploader.resize(0x20); // Make sure BS2 HLE doesn't try to run the apploader - *(u32*)&m_apploader[0x10] = (u32)-1; + Write32(static_cast<u32>(-1), 0x10, &m_apploader); return false; } } @@ -372,7 +372,7 @@ void VolumeDirectory::BuildFST() if (m_fst_address == 0) m_fst_address = APPLOADER_ADDRESS + 0x2000; - // 4 byte aligned start of data on disk + // 32 KiB aligned start of data on disk m_data_start_address = Common::AlignUp(m_fst_address + m_fst_data.size(), 0x8000ull); u64 current_data_address = m_data_start_address; @@ -494,7 +494,7 @@ void VolumeDirectory::WriteDirectory(const File::FSTEntry& parent_entry, u32* fs _dbg_assert_(DVDINTERFACE, m_virtual_disk.find(*data_offset) == m_virtual_disk.end()); m_virtual_disk.emplace(*data_offset, entry.physicalName); - // 4 byte aligned + // 32 KiB aligned - many games are fine with less alignment, but not all *data_offset = Common::AlignUp(*data_offset + std::max<u64>(entry.size, 1ull), 0x8000ull); } } |
