mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-08 00:59:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

DiscIO: Don't use all uppercase for enum values

Browse source 
Also removing some prefixes that we don't need now that we're
using enum classes instead of plain enums.
This commit is contained in:
JosJuice 2018-03-31 14:04:13 +02:00
commit 4387432436
22 changed files with 254 additions and 267 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Source/Core/Core/ConfigManager.cpp
View file

@ -888,7 +888,7 @@ struct SetGameMetadata
bool operator()(const BootParameters::Disc& disc) const
{
config->SetRunningGameMetadata(*disc.volume, disc.volume->GetGamePartition());
config->bWii = disc.volume->GetVolumeType() == DiscIO::Platform::WII_DISC;
config->bWii = disc.volume->GetVolumeType() == DiscIO::Platform::WiiDisc;
config->m_disc_booted_from_game_list = true;
*region = disc.volume->GetRegion();
return true;
@ -901,7 +901,7 @@ struct SetGameMetadata
config->bWii = executable.reader->IsWii();
*region = DiscIO::Region::UNKNOWN_REGION;
*region = DiscIO::Region::Unknown;
// Strip the .elf/.dol file extension and directories before the name
SplitPath(executable.path, nullptr, &config->m_debugger_game_id, nullptr);
@ -974,7 +974,7 @@ bool SConfig::SetPathsAndGameMetadata(const BootParameters& boot)
return false;
// Fall back to the system menu region, if possible.
if (m_region == DiscIO::Region::UNKNOWN_REGION)
if (m_region == DiscIO::Region::Unknown)
{
IOS::HLE::Kernel ios;
const IOS::ES::TMDReader system_menu_tmd = ios.GetES()->FindInstalledTMD(Titles::SYSTEM_MENU);
@ -983,7 +983,7 @@ bool SConfig::SetPathsAndGameMetadata(const BootParameters& boot)
}
// Fall back to PAL.
if (m_region == DiscIO::Region::UNKNOWN_REGION)
if (m_region == DiscIO::Region::Unknown)
m_region = DiscIO::Region::PAL;
// Set up paths
@ -1054,9 +1054,8 @@ DiscIO::Language SConfig::GetCurrentLanguage(bool wii) const
DiscIO::Language language = static_cast<DiscIO::Language>(language_value);
// Get rid of invalid values (probably doesn't matter, but might as well do it)
if (language > DiscIO::Language::LANGUAGE_UNKNOWN ||
language < DiscIO::Language::LANGUAGE_JAPANESE)
language = DiscIO::Language::LANGUAGE_UNKNOWN;
if (language > DiscIO::Language::Unknown || language < DiscIO::Language::Japanese)
language = DiscIO::Language::Unknown;
return language;
}