summaryrefslogtreecommitdiff
path: root/Source/Core/DiscIO
diff options
context:
space:
mode:
authorLPFaint99 <lpfaint99@gmail.com>2009-03-07 18:03:53 +0000
committerLPFaint99 <lpfaint99@gmail.com>2009-03-07 18:03:53 +0000
commit7455361ed2b22284947db89167977901af600d12 (patch)
tree9f19ec4607ff61005e7b738c9258b4c09118a53e /Source/Core/DiscIO
parentc3cda83bb2732e4db27ff319678c5831508d8053 (diff)
Adds Italy country code
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2600 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/DiscIO')
-rw-r--r--Source/Core/DiscIO/Src/Volume.h1
-rw-r--r--Source/Core/DiscIO/Src/VolumeDirectory.cpp62
-rw-r--r--Source/Core/DiscIO/Src/VolumeGC.cpp76
-rw-r--r--Source/Core/DiscIO/Src/VolumeWiiCrypted.cpp64
4 files changed, 108 insertions, 95 deletions
diff --git a/Source/Core/DiscIO/Src/Volume.h b/Source/Core/DiscIO/Src/Volume.h
index d915f1f0a6..e5e2880d47 100644
--- a/Source/Core/DiscIO/Src/Volume.h
+++ b/Source/Core/DiscIO/Src/Volume.h
@@ -53,6 +53,7 @@ class IVolume
COUNTRY_USA = 2,
COUNTRY_JAP,
COUNTRY_KOR,
+ COUNTRY_ITALY,
COUNTRY_UNKNOWN,
NUMBER_OF_COUNTRIES
};
diff --git a/Source/Core/DiscIO/Src/VolumeDirectory.cpp b/Source/Core/DiscIO/Src/VolumeDirectory.cpp
index e50feef14a..426e42ead4 100644
--- a/Source/Core/DiscIO/Src/VolumeDirectory.cpp
+++ b/Source/Core/DiscIO/Src/VolumeDirectory.cpp
@@ -167,41 +167,45 @@ IVolume::ECountry CVolumeDirectory::GetCountry() const
switch (CountryCode)
{
- case 'S':
- country = COUNTRY_EUROPE;
- break; // PAL <- that is shitty :) zelda demo disc
+ case 'S':
+ country = COUNTRY_EUROPE;
+ break; // PAL <- that is shitty :) zelda demo disc
- case 'P':
- country = COUNTRY_EUROPE;
- break; // PAL
+ case 'P':
+ country = COUNTRY_EUROPE;
+ break; // PAL
- case 'D':
- country = COUNTRY_EUROPE;
- break; // PAL
+ case 'D':
+ country = COUNTRY_EUROPE;
+ break; // PAL
- case 'F':
- country = COUNTRY_FRANCE;
- break; // PAL
+ case 'F':
+ country = COUNTRY_FRANCE;
+ break; // PAL
+
+ case 'I':
+ country = COUNTRY_ITALY;
+ break; // PAL
- case 'X':
- country = COUNTRY_EUROPE;
- break; // XIII <- uses X but is PAL rip
+ case 'X':
+ country = COUNTRY_EUROPE;
+ break; // XIII <- uses X but is PAL rip
- case 'E':
- country = COUNTRY_USA;
- break; // USA
+ case 'E':
+ country = COUNTRY_USA;
+ break; // USA
- case 'J':
- country = COUNTRY_JAP;
- break; // JAP
+ case 'J':
+ country = COUNTRY_JAP;
+ break; // JAP
- case 'O':
- country = COUNTRY_UNKNOWN;
- break; // SDK
+ case 'O':
+ country = COUNTRY_UNKNOWN;
+ break; // SDK
- default:
- country = COUNTRY_UNKNOWN;
- break;
+ default:
+ country = COUNTRY_UNKNOWN;
+ break;
}
return(country);
@@ -262,8 +266,8 @@ std::string CVolumeDirectory::ExtractDirectoryName(const std::string& _rDirector
if(lastSep != directoryName.size() - 1)
{
// TODO: This assumes that file names will always have a dot in them
- // and directory names never will; both assumptions are often
- // right but in general wrong.
+ // and directory names never will; both assumptions are often
+ // right but in general wrong.
size_t extensionStart = directoryName.find_last_of('.');
if(extensionStart != std::string::npos && extensionStart > lastSep)
{
diff --git a/Source/Core/DiscIO/Src/VolumeGC.cpp b/Source/Core/DiscIO/Src/VolumeGC.cpp
index 93ff459b52..aca22480c9 100644
--- a/Source/Core/DiscIO/Src/VolumeGC.cpp
+++ b/Source/Core/DiscIO/Src/VolumeGC.cpp
@@ -88,42 +88,46 @@ IVolume::ECountry CVolumeGC::GetCountry() const
switch (CountryCode)
{
- case 'S':
- country = COUNTRY_EUROPE;
- break; // PAL // <- that is shitty :) zelda demo disc
-
- case 'P':
- country = COUNTRY_EUROPE;
- break; // PAL
-
- case 'D':
- country = COUNTRY_EUROPE;
- break; // PAL
-
- case 'F':
- country = COUNTRY_FRANCE;
- break; // PAL
-
- case 'X':
- country = COUNTRY_EUROPE;
- break; // XIII <- uses X but is PAL
-
- case 'E':
- country = COUNTRY_USA;
- break; // USA
-
- case 'J':
- country = COUNTRY_JAP;
- break; // JAP
-
- case 'O':
- country = COUNTRY_UNKNOWN;
- break; // SDK
-
- default:
- // PanicAlert(StringFromFormat("Unknown Country Code!").c_str());
- country = COUNTRY_UNKNOWN;
- break;
+ case 'S':
+ country = COUNTRY_EUROPE;
+ break; // PAL // <- that is shitty :) zelda demo disc
+
+ case 'P':
+ country = COUNTRY_EUROPE;
+ break; // PAL
+
+ case 'D':
+ country = COUNTRY_EUROPE;
+ break; // PAL
+
+ case 'F':
+ country = COUNTRY_FRANCE;
+ break; // PAL
+
+ case 'I':
+ country = COUNTRY_ITALY;
+ break; // PAL
+
+ case 'X':
+ country = COUNTRY_EUROPE;
+ break; // XIII <- uses X but is PAL
+
+ case 'E':
+ country = COUNTRY_USA;
+ break; // USA
+
+ case 'J':
+ country = COUNTRY_JAP;
+ break; // JAP
+
+ case 'O':
+ country = COUNTRY_UNKNOWN;
+ break; // SDK
+
+ default:
+ // PanicAlert(StringFromFormat("Unknown Country Code!").c_str());
+ country = COUNTRY_UNKNOWN;
+ break;
}
return(country);
diff --git a/Source/Core/DiscIO/Src/VolumeWiiCrypted.cpp b/Source/Core/DiscIO/Src/VolumeWiiCrypted.cpp
index dfbf49f0d2..ed9a9bcf8c 100644
--- a/Source/Core/DiscIO/Src/VolumeWiiCrypted.cpp
+++ b/Source/Core/DiscIO/Src/VolumeWiiCrypted.cpp
@@ -90,7 +90,7 @@ CVolumeWiiCrypted::Read(u64 _ReadOffset, u64 _Length, u8* _pBuffer) const
// increase buffers
_Length -= CopySize;
- _pBuffer += CopySize;
+ _pBuffer += CopySize;
_ReadOffset += CopySize;
}
@@ -133,45 +133,49 @@ CVolumeWiiCrypted::GetCountry() const
switch (CountryCode)
{
- case 'S':
- country = COUNTRY_EUROPE;
- break; // PAL // <- that is shitty :) zelda demo disc
+ case 'S':
+ country = COUNTRY_EUROPE;
+ break; // PAL // <- that is shitty :) zelda demo disc
- case 'P':
- country = COUNTRY_EUROPE;
- break; // PAL
+ case 'P':
+ country = COUNTRY_EUROPE;
+ break; // PAL
- case 'D':
- country = COUNTRY_EUROPE;
- break; // PAL
+ case 'D':
+ country = COUNTRY_EUROPE;
+ break; // PAL
- case 'F':
- country = COUNTRY_FRANCE;
- break; // PAL
+ case 'F':
+ country = COUNTRY_FRANCE;
+ break; // PAL
- case 'X':
- country = COUNTRY_EUROPE;
- break; // XIII <- uses X but is PAL rip
+ case 'I':
+ country = COUNTRY_ITALY;
+ break; // PAL
- case 'E':
- country = COUNTRY_USA;
- break; // USA
+ case 'X':
+ country = COUNTRY_EUROPE;
+ break; // XIII <- uses X but is PAL rip
- case 'J':
- country = COUNTRY_JAP;
- break; // JAP
+ case 'E':
+ country = COUNTRY_USA;
+ break; // USA
+
+ case 'J':
+ country = COUNTRY_JAP;
+ break; // JAP
case 'K':
- country = COUNTRY_KOR;
- break; // KOR
+ country = COUNTRY_KOR;
+ break; // KOR
- case 'O':
- country = COUNTRY_UNKNOWN;
- break; // SDK
+ case 'O':
+ country = COUNTRY_UNKNOWN;
+ break; // SDK
- default:
- PanicAlert(StringFromFormat("Unknown Country Code!").c_str());
- break;
+ default:
+ PanicAlert(StringFromFormat("Unknown Country Code!").c_str());
+ break;
}
return(country);