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/VolumeGC.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Source/Core/DiscIO/VolumeGC.cpp') diff --git a/Source/Core/DiscIO/VolumeGC.cpp b/Source/Core/DiscIO/VolumeGC.cpp index 7d09fc234e..5f6e91b847 100644 --- a/Source/Core/DiscIO/VolumeGC.cpp +++ b/Source/Core/DiscIO/VolumeGC.cpp @@ -61,10 +61,10 @@ IVolume::ECountry CVolumeGC::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 CVolumeGC::GetMakerID() const -- 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/VolumeGC.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Source/Core/DiscIO/VolumeGC.cpp') diff --git a/Source/Core/DiscIO/VolumeGC.cpp b/Source/Core/DiscIO/VolumeGC.cpp index 5f6e91b847..132a630cf0 100644 --- a/Source/Core/DiscIO/VolumeGC.cpp +++ b/Source/Core/DiscIO/VolumeGC.cpp @@ -149,9 +149,9 @@ u64 CVolumeGC::GetRawSize() const bool CVolumeGC::IsDiscTwo() const { - bool discTwo = false; - Read(6,1, (u8*) &discTwo); - return discTwo; + u8 disc_two_check; + Read(6, 1, &disc_two_check); + return (disc_two_check == 1); } CVolumeGC::StringDecoder CVolumeGC::GetStringDecoder(ECountry country) -- cgit v1.2.3