diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2014-09-01 22:45:12 +0200 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2014-09-01 22:45:12 +0200 |
| commit | b026217984d1098592083773f249e8afa3a1669d (patch) | |
| tree | dbce5fcbb2c65f96bf5b7600b2d3e45698371912 /Source/Core/DiscIO/VolumeWiiCrypted.cpp | |
| parent | 5cc0bda3d53fc3edf037f85784cba09f7322d096 (diff) | |
| parent | 1977ea42ae71172a2fda0f2ae1a0b8b60b07e20e (diff) | |
Merge pull request #933 from lioncash/prefix
DiscIO: Prefix class member variables with "m_"
Diffstat (limited to 'Source/Core/DiscIO/VolumeWiiCrypted.cpp')
| -rw-r--r-- | Source/Core/DiscIO/VolumeWiiCrypted.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/Core/DiscIO/VolumeWiiCrypted.cpp b/Source/Core/DiscIO/VolumeWiiCrypted.cpp index d9ca14a6d1..2d9262fb82 100644 --- a/Source/Core/DiscIO/VolumeWiiCrypted.cpp +++ b/Source/Core/DiscIO/VolumeWiiCrypted.cpp @@ -24,7 +24,7 @@ CVolumeWiiCrypted::CVolumeWiiCrypted(IBlobReader* _pReader, u64 _VolumeOffset, m_AES_ctx(new aes_context), m_pBuffer(nullptr), m_VolumeOffset(_VolumeOffset), - dataOffset(0x20000), + m_dataOffset(0x20000), m_LastDecryptedBlockOffset(-1) { aes_setkey_dec(m_AES_ctx.get(), _pVolumeKey, 128); @@ -66,7 +66,7 @@ bool CVolumeWiiCrypted::Read(u64 _ReadOffset, u64 _Length, u8* _pBuffer) const u64 Offset = _ReadOffset % 0x7C00; // read current block - if (!m_pReader->Read(m_VolumeOffset + dataOffset + Block * 0x8000, 0x8000, m_pBuffer)) + if (!m_pReader->Read(m_VolumeOffset + m_dataOffset + Block * 0x8000, 0x8000, m_pBuffer)) { return(false); } @@ -246,7 +246,7 @@ bool CVolumeWiiCrypted::CheckIntegrity() const u32 nClusters = (u32)(partDataSize / 0x8000); for (u32 clusterID = 0; clusterID < nClusters; ++clusterID) { - u64 clusterOff = m_VolumeOffset + dataOffset + (u64)clusterID * 0x8000; + u64 clusterOff = m_VolumeOffset + m_dataOffset + (u64)clusterID * 0x8000; // Read and decrypt the cluster metadata u8 clusterMDCrypted[0x400]; |