diff options
| author | Lioncash <mathew1800@gmail.com> | 2015-03-05 12:18:53 -0500 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2015-03-05 12:18:53 -0500 |
| commit | b7514955e51ed2cbbcd83417817d0c87d03e7651 (patch) | |
| tree | 9d43b7c2fcd5f7b7d0e2609ad436a9a10c66e75f /Source/Core/DiscIO/VolumeGC.cpp | |
| parent | da56582ba017284fadda90d3091dc40f1784402a (diff) | |
| parent | 492aa5c3915f38be7ea90f5dddd99f3244cf8914 (diff) | |
Merge pull request #2113 from Stevoisiak/VolumeCleanup
Basic volume code cleanup
Diffstat (limited to 'Source/Core/DiscIO/VolumeGC.cpp')
| -rw-r--r-- | Source/Core/DiscIO/VolumeGC.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/Core/DiscIO/VolumeGC.cpp b/Source/Core/DiscIO/VolumeGC.cpp index 7d09fc234e..132a630cf0 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 @@ -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) |