ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1066 from lioncash/breaks 

DiscIO: Remove unnecessary break statements.
This commit is contained in:
Pierre Bourdon 2014-09-14 01:58:44 +02:00
parent 9607cc4159 4db2af2d42
commit eee473ed5f
2 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Source/Core/DiscIO/VolumeCommon.cpp
View File

@ -21,7 +21,6 @@ IVolume::ECountry CountrySwitch(u8 CountryCode)
// PAL // PAL
case 'D': // German case 'D': // German
return IVolume::COUNTRY_GERMANY; return IVolume::COUNTRY_GERMANY;
break;
case 'X': // Used by a couple PAL games case 'X': // Used by a couple PAL games
case 'Y': // German, french case 'Y': // German, french
@ -32,50 +31,40 @@ IVolume::ECountry CountrySwitch(u8 CountryCode)
case 'P': case 'P':
case 'U': // Australia case 'U': // Australia
return IVolume::COUNTRY_EUROPE; return IVolume::COUNTRY_EUROPE;
break;
case 'F': case 'F':
return IVolume::COUNTRY_FRANCE; return IVolume::COUNTRY_FRANCE;
break;
case 'I': case 'I':
return IVolume::COUNTRY_ITALY; return IVolume::COUNTRY_ITALY;
break;
case 'R': case 'R':
return IVolume::COUNTRY_RUSSIA; return IVolume::COUNTRY_RUSSIA;
break;
// NTSC // NTSC
case 'E': case 'E':
case 'N': // Japanese import to USA and other NTSC regions case 'N': // Japanese import to USA and other NTSC regions
case 'Z': // Prince Of Persia - The Forgotten Sands (WII) case 'Z': // Prince Of Persia - The Forgotten Sands (WII)
return IVolume::COUNTRY_USA; return IVolume::COUNTRY_USA;
break;
case 'J': case 'J':
return IVolume::COUNTRY_JAPAN; return IVolume::COUNTRY_JAPAN;
break;
case 'K': case 'K':
case 'T': // Korea with English language case 'T': // Korea with English language
case 'Q': // Korea with Japanese language case 'Q': // Korea with Japanese language
return IVolume::COUNTRY_KOREA; return IVolume::COUNTRY_KOREA;
break;
case 'O': case 'O':
return IVolume::COUNTRY_SDK; return IVolume::COUNTRY_SDK;
break;
case 'W': case 'W':
return IVolume::COUNTRY_TAIWAN; return IVolume::COUNTRY_TAIWAN;
break;
default: default:
if (CountryCode > 'A') // Silently ignore IOS wads if (CountryCode > 'A') // Silently ignore IOS wads
WARN_LOG(DISCIO, "Unknown Country Code! %c", CountryCode); WARN_LOG(DISCIO, "Unknown Country Code! %c", CountryCode);
return IVolume::COUNTRY_UNKNOWN; return IVolume::COUNTRY_UNKNOWN;
break;
} }
} }

3
Source/Core/DiscIO/VolumeCreator.cpp
View File

@ -94,7 +94,6 @@ IVolume* CreateVolumeFromFilename(const std::string& _rFilename, u32 _PartitionG
return pVolume; return pVolume;
} }
break;
case DISC_TYPE_UNK: case DISC_TYPE_UNK:
default: default:
@ -104,10 +103,8 @@ IVolume* CreateVolumeFromFilename(const std::string& _rFilename, u32 _PartitionG
NOTICE_LOG(DISCIO, "%s does not have the Magic word for a gcm, wiidisc or wad file\n" NOTICE_LOG(DISCIO, "%s does not have the Magic word for a gcm, wiidisc or wad file\n"
"Set Log Verbosity to Warning and attempt to load the game again to view the values", Filename.c_str()); "Set Log Verbosity to Warning and attempt to load the game again to view the values", Filename.c_str());
delete pReader; delete pReader;
return nullptr;
} }
// unreachable code
return nullptr; return nullptr;
} }