diff options
| author | comex <comexk@gmail.com> | 2015-06-02 20:29:08 -0400 |
|---|---|---|
| committer | comex <comexk@gmail.com> | 2015-06-02 20:29:08 -0400 |
| commit | 349f9d549370d1b1ef7662e4cedef0c96133f232 (patch) | |
| tree | ed25fd2e5620ddea480ff95c376e8aed1d654040 /Source/Core/DiscIO/VolumeWiiCrypted.cpp | |
| parent | 2ae6fb9240ffd0a25727bede295d0d3afa3cab0c (diff) | |
| parent | 301218a1039a651067a524bceccbd970f965235c (diff) | |
Merge pull request #2484 from JosJuice/volume-return-types
Volume: Use more appropriate types for some returned values
Diffstat (limited to 'Source/Core/DiscIO/VolumeWiiCrypted.cpp')
| -rw-r--r-- | Source/Core/DiscIO/VolumeWiiCrypted.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/Source/Core/DiscIO/VolumeWiiCrypted.cpp b/Source/Core/DiscIO/VolumeWiiCrypted.cpp index 36b3280d5f..4a4c1ad3bc 100644 --- a/Source/Core/DiscIO/VolumeWiiCrypted.cpp +++ b/Source/Core/DiscIO/VolumeWiiCrypted.cpp @@ -181,7 +181,7 @@ std::string CVolumeWiiCrypted::GetMakerID() const return makerID; } -int CVolumeWiiCrypted::GetRevision() const +u16 CVolumeWiiCrypted::GetRevision() const { if (!m_pReader) return 0; @@ -243,14 +243,13 @@ bool CVolumeWiiCrypted::IsWiiDisc() const return true; } -bool CVolumeWiiCrypted::IsDiscTwo() const +u8 CVolumeWiiCrypted::GetDiscNumber() const { - u8 disc_two_check; - m_pReader->Read(6, 1, &disc_two_check); - return (disc_two_check == 1); + u8 disc_number; + m_pReader->Read(6, 1, &disc_number); + return disc_number; } - u64 CVolumeWiiCrypted::GetSize() const { if (m_pReader) |