From 06cb85991e7abbbaf50479eb902ee5c43c7415a9 Mon Sep 17 00:00:00 2001 From: Stevoisiak Date: Mon, 23 Feb 2015 20:43:29 -0500 Subject: De-capitalized CountryCode --- Source/Core/DiscIO/VolumeWiiCrypted.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Source/Core/DiscIO/VolumeWiiCrypted.cpp') diff --git a/Source/Core/DiscIO/VolumeWiiCrypted.cpp b/Source/Core/DiscIO/VolumeWiiCrypted.cpp index dad2977ba0..d73db3274c 100644 --- a/Source/Core/DiscIO/VolumeWiiCrypted.cpp +++ b/Source/Core/DiscIO/VolumeWiiCrypted.cpp @@ -158,10 +158,10 @@ IVolume::ECountry CVolumeWiiCrypted::GetCountry() const if (!m_pReader) return COUNTRY_UNKNOWN; - u8 CountryCode; - m_pReader->Read(3, 1, &CountryCode); + u8 country_code; + m_pReader->Read(3, 1, &country_code); - return CountrySwitch(CountryCode); + return CountrySwitch(country_code); } std::string CVolumeWiiCrypted::GetMakerID() const -- cgit v1.2.3 From ede4977d12029fc488e6b8629041cbca6ccf0153 Mon Sep 17 00:00:00 2001 From: Stevoisiak Date: Thu, 26 Feb 2015 17:10:18 -0500 Subject: VolumeWiiCrypted: Implement IsDiscTwo() Allows us to check if a Wii game is marked as Disc 2. --- Source/Core/DiscIO/VolumeWiiCrypted.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'Source/Core/DiscIO/VolumeWiiCrypted.cpp') diff --git a/Source/Core/DiscIO/VolumeWiiCrypted.cpp b/Source/Core/DiscIO/VolumeWiiCrypted.cpp index d73db3274c..6ea1a166b1 100644 --- a/Source/Core/DiscIO/VolumeWiiCrypted.cpp +++ b/Source/Core/DiscIO/VolumeWiiCrypted.cpp @@ -237,6 +237,14 @@ bool CVolumeWiiCrypted::IsWiiDisc() const return true; } +bool CVolumeWiiCrypted::IsDiscTwo() const +{ + bool discTwo = false; + m_pReader->Read(6, 1, (u8*)&discTwo); + return discTwo; +} + + u64 CVolumeWiiCrypted::GetSize() const { if (m_pReader) -- cgit v1.2.3 From eff924e9e2c541efa40b1afcf0828a30896c9d08 Mon Sep 17 00:00:00 2001 From: Stevoisiak Date: Sat, 28 Feb 2015 17:24:02 -0500 Subject: General Formatting --- Source/Core/DiscIO/VolumeWiiCrypted.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source/Core/DiscIO/VolumeWiiCrypted.cpp') diff --git a/Source/Core/DiscIO/VolumeWiiCrypted.cpp b/Source/Core/DiscIO/VolumeWiiCrypted.cpp index 6ea1a166b1..0c06efefe9 100644 --- a/Source/Core/DiscIO/VolumeWiiCrypted.cpp +++ b/Source/Core/DiscIO/VolumeWiiCrypted.cpp @@ -95,7 +95,7 @@ bool CVolumeWiiCrypted::Read(u64 _ReadOffset, u64 _Length, u8* _pBuffer, bool de memcpy(_pBuffer, &m_LastDecryptedBlock[Offset], (size_t)CopySize); // Update offsets - _Length -= CopySize; + _Length -= CopySize; _pBuffer += CopySize; _ReadOffset += CopySize; } -- cgit v1.2.3 From 492aa5c3915f38be7ea90f5dddd99f3244cf8914 Mon Sep 17 00:00:00 2001 From: Stevoisiak Date: Sat, 28 Feb 2015 22:03:53 -0500 Subject: DiscIO: Get rid of unsafe cast --- Source/Core/DiscIO/VolumeWiiCrypted.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Source/Core/DiscIO/VolumeWiiCrypted.cpp') diff --git a/Source/Core/DiscIO/VolumeWiiCrypted.cpp b/Source/Core/DiscIO/VolumeWiiCrypted.cpp index 0c06efefe9..4c703fdb3f 100644 --- a/Source/Core/DiscIO/VolumeWiiCrypted.cpp +++ b/Source/Core/DiscIO/VolumeWiiCrypted.cpp @@ -239,9 +239,9 @@ bool CVolumeWiiCrypted::IsWiiDisc() const bool CVolumeWiiCrypted::IsDiscTwo() const { - bool discTwo = false; - m_pReader->Read(6, 1, (u8*)&discTwo); - return discTwo; + u8 disc_two_check; + m_pReader->Read(6, 1, &disc_two_check); + return (disc_two_check == 1); } -- cgit v1.2.3