From 301218a1039a651067a524bceccbd970f965235c Mon Sep 17 00:00:00 2001 From: JosJuice Date: Fri, 29 May 2015 21:14:02 +0200 Subject: Volume: Use more appropriate types for some returned values Disc number is changed from bool to u8, and revision is changed from int to u16 (WADs can use all 16 bits, but discs can only use 8 bits). --- Source/Core/DiscIO/VolumeWiiCrypted.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'Source/Core/DiscIO/VolumeWiiCrypted.cpp') 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) -- cgit v1.2.3