diff options
| author | Shawn Hoffman <godisgovernment@gmail.com> | 2008-11-12 04:54:17 +0000 |
|---|---|---|
| committer | Shawn Hoffman <godisgovernment@gmail.com> | 2008-11-12 04:54:17 +0000 |
| commit | f7cb34f1e05fb9cca7ed84ead30f823613670598 (patch) | |
| tree | fd142a566d7d45f9164f1d72c9281b6b2ec382b8 /Source/Core/DiscIO | |
| parent | 8c7d7a6c3657f57c2468e0b49e5696fa7d0c9b90 (diff) | |
Migration to the new dir struct (in code only!, no deletion of old dirs...yet). VS projects copy Data/* to Binary/<arch>. Added SConscript to some projects where it was missing. This is the time to move over all your files!
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1140 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/DiscIO')
| -rw-r--r-- | Source/Core/DiscIO/Src/BannerLoaderWii.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/DiscIO/Src/VolumeCreator.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Source/Core/DiscIO/Src/BannerLoaderWii.cpp b/Source/Core/DiscIO/Src/BannerLoaderWii.cpp index 8555b6e3e5..212d5cb149 100644 --- a/Source/Core/DiscIO/Src/BannerLoaderWii.cpp +++ b/Source/Core/DiscIO/Src/BannerLoaderWii.cpp @@ -35,7 +35,7 @@ CBannerLoaderWii::CBannerLoaderWii(DiscIO::IFileSystem& _rFileSystem) char TitleID[4];
_rFileSystem.GetVolume()->Read(0, 4, (u8*)TitleID);
- sprintf(Filename, "Wii/title/00010000/%02x%02x%02x%02x/data/banner.bin", (u8)TitleID[0], (u8)TitleID[1], (u8)TitleID[2], (u8)TitleID[3]);
+ sprintf(Filename, WII_USER_DIR "/title/00010000/%02x%02x%02x%02x/data/banner.bin", (u8)TitleID[0], (u8)TitleID[1], (u8)TitleID[2], (u8)TitleID[3]);
// load the opening.bnr
size_t FileSize = File::GetSize(Filename);
diff --git a/Source/Core/DiscIO/Src/VolumeCreator.cpp b/Source/Core/DiscIO/Src/VolumeCreator.cpp index 7cf08ab664..862cb028bf 100644 --- a/Source/Core/DiscIO/Src/VolumeCreator.cpp +++ b/Source/Core/DiscIO/Src/VolumeCreator.cpp @@ -124,10 +124,10 @@ IVolume* CreateVolumeFromCryptedWiiImage(IBlobReader& _rReader, u32 _VolumeType) {
if (!g_MasterKeyInit)
{
- FILE* pT = fopen("WII/masterkey.bin", "rb");
+ FILE* pT = fopen(WII_MASTERKEY_FILE, "rb");
if (pT == NULL)
{
- PanicAlert("Can't open WII/masterkey.bin");
+ PanicAlert("Can't open " WII_MASTERKEY_FILE);
return NULL;
}
|