piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 22:29:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

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
parent c3398c9e2c
commit 4387432436
22 changed files with 254 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
Source/Core/DiscIO/Enums.cpp
View File

@ -20,43 +20,43 @@ std::string GetName(Country country, bool translate)
switch (country)
{
case Country::COUNTRY_EUROPE:
case Country::Europe:
name = _trans("Europe");
break;
case Country::COUNTRY_JAPAN:
case Country::Japan:
name = _trans("Japan");
break;
case Country::COUNTRY_USA:
case Country::USA:
name = _trans("USA");
break;
case Country::COUNTRY_AUSTRALIA:
case Country::Australia:
name = _trans("Australia");
break;
case Country::COUNTRY_FRANCE:
case Country::France:
name = _trans("France");
break;
case Country::COUNTRY_GERMANY:
case Country::Germany:
name = _trans("Germany");
break;
case Country::COUNTRY_ITALY:
case Country::Italy:
name = _trans("Italy");
break;
case Country::COUNTRY_KOREA:
case Country::Korea:
name = _trans("Korea");
break;
case Country::COUNTRY_NETHERLANDS:
case Country::Netherlands:
name = _trans("Netherlands");
break;
case Country::COUNTRY_RUSSIA:
case Country::Russia:
name = _trans("Russia");
break;
case Country::COUNTRY_SPAIN:
case Country::Spain:
name = _trans("Spain");
break;
case Country::COUNTRY_TAIWAN:
case Country::Taiwan:
name = _trans("Taiwan");
break;
case Country::COUNTRY_WORLD:
case Country::World:
name = _trans("World");
break;
default:
@ -73,34 +73,34 @@ std::string GetName(Language language, bool translate)
switch (language)
{
case Language::LANGUAGE_JAPANESE:
case Language::Japanese:
name = _trans("Japanese");
break;
case Language::LANGUAGE_ENGLISH:
case Language::English:
name = _trans("English");
break;
case Language::LANGUAGE_GERMAN:
case Language::German:
name = _trans("German");
break;
case Language::LANGUAGE_FRENCH:
case Language::French:
name = _trans("French");
break;
case Language::LANGUAGE_SPANISH:
case Language::Spanish:
name = _trans("Spanish");
break;
case Language::LANGUAGE_ITALIAN:
case Language::Italian:
name = _trans("Italian");
break;
case Language::LANGUAGE_DUTCH:
case Language::Dutch:
name = _trans("Dutch");
break;
case Language::LANGUAGE_SIMPLIFIED_CHINESE:
case Language::SimplifiedChinese:
name = _trans("Simplified Chinese");
break;
case Language::LANGUAGE_TRADITIONAL_CHINESE:
case Language::TraditionalChinese:
name = _trans("Traditional Chinese");
break;
case Language::LANGUAGE_KOREAN:
case Language::Korean:
name = _trans("Korean");
break;
default:
@ -113,12 +113,12 @@ std::string GetName(Language language, bool translate)
bool IsDisc(Platform volume_type)
{
return volume_type == Platform::GAMECUBE_DISC || volume_type == Platform::WII_DISC;
return volume_type == Platform::GameCubeDisc || volume_type == Platform::WiiDisc;
}
bool IsWii(Platform volume_type)
{
return volume_type == Platform::WII_DISC || volume_type == Platform::WII_WAD;
return volume_type == Platform::WiiDisc || volume_type == Platform::WiiWAD;
}
bool IsNTSC(Region region)
@ -133,15 +133,15 @@ Country TypicalCountryForRegion(Region region)
switch (region)
{
case Region::NTSC_J:
return Country::COUNTRY_JAPAN;
return Country::Japan;
case Region::NTSC_U:
return Country::COUNTRY_USA;
return Country::USA;
case Region::PAL:
return Country::COUNTRY_EUROPE;
return Country::Europe;
case Region::NTSC_K:
return Country::COUNTRY_KOREA;
return Country::Korea;
default:
return Country::COUNTRY_UNKNOWN;
return Country::Unknown;
}
}
@ -185,7 +185,7 @@ Region RegionSwitchWii(u8 country_code)
return Region::NTSC_K;
default:
return Region::UNKNOWN_REGION;
return Region::Unknown;
}
}
@ -195,66 +195,66 @@ Country CountrySwitch(u8 country_code)
{
// Worldwide
case 'A':
return Country::COUNTRY_WORLD;
return Country::World;
// PAL
case 'D':
return Country::COUNTRY_GERMANY;
return Country::Germany;
case 'X': // Used by a couple PAL games
case 'Y': // German, French
case 'L': // Japanese import to PAL regions
case 'M': // Japanese import to PAL regions
case 'P':
return Country::COUNTRY_EUROPE;
return Country::Europe;
case 'U':
return Country::COUNTRY_AUSTRALIA;
return Country::Australia;
case 'F':
return Country::COUNTRY_FRANCE;
return Country::France;
case 'I':
return Country::COUNTRY_ITALY;
return Country::Italy;
case 'H':
return Country::COUNTRY_NETHERLANDS;
return Country::Netherlands;
case 'R':
return Country::COUNTRY_RUSSIA;
return Country::Russia;
case 'S':
return Country::COUNTRY_SPAIN;
return Country::Spain;
// NTSC
case 'E':
case 'N': // Japanese import to USA and other NTSC regions
case 'Z': // Prince of Persia - The Forgotten Sands (Wii)
case 'B': // Ufouria: The Saga (Virtual Console)
return Country::COUNTRY_USA;
return Country::USA;
case 'J':
return Country::COUNTRY_JAPAN;
return Country::Japan;
case 'K':
case 'Q': // Korea with Japanese language
case 'T': // Korea with English language
return Country::COUNTRY_KOREA;
return Country::Korea;
case 'W':
return Country::COUNTRY_TAIWAN;
return Country::Taiwan;
default:
if (country_code > 'A') // Silently ignore IOS wads
WARN_LOG(DISCIO, "Unknown Country Code! %c", country_code);
return Country::COUNTRY_UNKNOWN;
return Country::Unknown;
}
}
Region GetSysMenuRegion(u16 title_version)
{
if (title_version == 33)
return Region::UNKNOWN_REGION; // 1.0 uses 33 as the version number in all regions
return Region::Unknown; // 1.0 uses 33 as the version number in all regions
switch (title_version & 0xf)
{
@ -267,7 +267,7 @@ Region GetSysMenuRegion(u16 title_version)
case 6:
return Region::NTSC_K;
default:
return Region::UNKNOWN_REGION;
return Region::Unknown;
}
}
@ -292,7 +292,7 @@ std::string GetSysMenuVersionString(u16 title_version)
case Region::NTSC_K:
region_letter = "K";
break;
case Region::UNKNOWN_REGION:
case Region::Unknown:
WARN_LOG(DISCIO, "Unknown region for Wii Menu version %u", title_version);
break;
}