diff options
| author | shuffle2 <godisgovernment@gmail.com> | 2017-06-07 21:20:06 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-07 21:20:06 -0700 |
| commit | ffd8309aca806a6cf5ca4da85f5854ef14c8e0d9 (patch) | |
| tree | ba029b5a68e1613f3dca3185a854ef70d05de61e /Source/Core/DiscIO/FileSystemGCWii.cpp | |
| parent | a2358786dc66eab8fa63987751d4e3fc1a3ee525 (diff) | |
| parent | 9ee63608b3c7160cadb0291e577b158d1b8aa5c6 (diff) | |
Merge branch 'master' into fix-unittests
Diffstat (limited to 'Source/Core/DiscIO/FileSystemGCWii.cpp')
| -rw-r--r-- | Source/Core/DiscIO/FileSystemGCWii.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/Core/DiscIO/FileSystemGCWii.cpp b/Source/Core/DiscIO/FileSystemGCWii.cpp index cf14144f50..b809047679 100644 --- a/Source/Core/DiscIO/FileSystemGCWii.cpp +++ b/Source/Core/DiscIO/FileSystemGCWii.cpp @@ -77,10 +77,10 @@ u64 FileSystemGCWii::ReadFile(const std::string& _rFullPath, u8* _pBuffer, u64 _ u64 read_length = std::min(_MaxBufferSize, pFileInfo->m_FileSize - _OffsetInFile); - DEBUG_LOG( - DISCIO, - "Reading %" PRIx64 " bytes at %" PRIx64 " from file %s. Offset: %" PRIx64 " Size: %" PRIx64, - read_length, _OffsetInFile, _rFullPath.c_str(), pFileInfo->m_Offset, pFileInfo->m_FileSize); + DEBUG_LOG(DISCIO, "Reading %" PRIx64 " bytes at %" PRIx64 " from file %s. Offset: %" PRIx64 + " Size: %" PRIx64, + read_length, _OffsetInFile, _rFullPath.c_str(), pFileInfo->m_Offset, + pFileInfo->m_FileSize); m_rVolume->Read(pFileInfo->m_Offset + _OffsetInFile, read_length, _pBuffer, m_partition); return read_length; @@ -155,7 +155,7 @@ bool FileSystemGCWii::ExportApploader(const std::string& _rExportFolder) const std::optional<u64> FileSystemGCWii::GetBootDOLOffset() const { std::optional<u32> offset = m_rVolume->ReadSwapped<u32>(0x420, m_partition); - return offset ? static_cast<u64>(*offset) << 2 : std::optional<u64>(); + return offset ? static_cast<u64>(*offset) << m_offset_shift : std::optional<u64>(); } std::optional<u32> FileSystemGCWii::GetBootDOLSize(u64 dol_offset) const |