From b186f0821eb6120c395e8ebd4eba1b6835936dbc Mon Sep 17 00:00:00 2001 From: LPFaint99 Date: Thu, 14 Jan 2010 07:19:10 +0000 Subject: Adds experimental data.bin export of wii saves, use at your own risk as it has been tested only to the point that a real wii recognizes the save on an sd card Please post test results here or on issue 1945 removed the automated backup when importing from a save.bin fixed display of pokemon titles in memcardmanager git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4829 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/DolphinWX/Src/ISOFile.cpp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'Source/Core/DolphinWX/Src/ISOFile.cpp') diff --git a/Source/Core/DolphinWX/Src/ISOFile.cpp b/Source/Core/DolphinWX/Src/ISOFile.cpp index a27142a4e6..178d150433 100644 --- a/Source/Core/DolphinWX/Src/ISOFile.cpp +++ b/Source/Core/DolphinWX/Src/ISOFile.cpp @@ -24,7 +24,6 @@ #include "ISOFile.h" #include "StringUtil.h" -#include "VolumeCreator.h" #include "Filesystem.h" #include "BannerLoader.h" #include "FileSearch.h" @@ -216,6 +215,7 @@ const std::string GameListItem::GetWiiFSPath() const { DiscIO::IVolume *Iso = DiscIO::CreateVolumeFromFilename(m_FileName); + std::string ret("NULL"); if (Iso != NULL) { if (DiscIO::IsVolumeWiiDisc(Iso) || DiscIO::IsVolumeWadFile(Iso)) @@ -223,11 +223,7 @@ const std::string GameListItem::GetWiiFSPath() const char Path[250]; u64 Title; - if (DiscIO::IsVolumeWiiDisc(Iso)) - Iso->RAWRead((u64)0x0F8001DC, 8, (u8*)&Title); - else - Iso->GetTitleID((u8*)&Title); - + Iso->GetTitleID((u8*)&Title); Title = Common::swap64(Title); sprintf(Path, FULL_WII_USER_DIR "title/%08x/%08x/data/", (u32)(Title>>32), (u32)Title); @@ -235,10 +231,11 @@ const std::string GameListItem::GetWiiFSPath() const if (!File::Exists(Path)) File::CreateFullPath(Path); - return std::string(wxGetCwd().mb_str()) + std::string(Path).substr(strlen(ROOT_DIR)); + ret = std::string(wxGetCwd().mb_str()) + std::string(Path).substr(strlen(ROOT_DIR)); } + delete Iso; } - return "NULL"; + return ret; } -- cgit v1.2.3