summaryrefslogtreecommitdiff
path: root/Source/Core/DiscIO
diff options
context:
space:
mode:
authorhrydgard <hrydgard@gmail.com>2009-01-23 21:28:55 +0000
committerhrydgard <hrydgard@gmail.com>2009-01-23 21:28:55 +0000
commit70bc8167f8af6aa053b9335209c80f554d8fb597 (patch)
tree275f4138c1f0441be64ec0676d01fc365f8ffcb3 /Source/Core/DiscIO
parent7ecf884f9ae9b3cb8632b858999bf45d97211523 (diff)
Warp back to 1983!!! (rev 1983, that is, not the year :P)
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1997 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/DiscIO')
-rw-r--r--Source/Core/DiscIO/Src/BannerLoader.cpp4
-rw-r--r--Source/Core/DiscIO/Src/BannerLoaderWii.cpp5
2 files changed, 2 insertions, 7 deletions
diff --git a/Source/Core/DiscIO/Src/BannerLoader.cpp b/Source/Core/DiscIO/Src/BannerLoader.cpp
index 611c05a5eb..a45a286c4d 100644
--- a/Source/Core/DiscIO/Src/BannerLoader.cpp
+++ b/Source/Core/DiscIO/Src/BannerLoader.cpp
@@ -170,8 +170,8 @@ bool IBannerLoader::CopyUnicodeToString( std::string& _rDestination, const u16*
}
}
#else
- // FIXME completly broken on not windows!!!!!
- // _rDestination = _src;
+ // not implement other than windows
+ _rDestination = _src;
returnCode = true;
#endif
return returnCode;
diff --git a/Source/Core/DiscIO/Src/BannerLoaderWii.cpp b/Source/Core/DiscIO/Src/BannerLoaderWii.cpp
index 1357ef3d9a..1cd8b9ff24 100644
--- a/Source/Core/DiscIO/Src/BannerLoaderWii.cpp
+++ b/Source/Core/DiscIO/Src/BannerLoaderWii.cpp
@@ -126,8 +126,6 @@ CBannerLoaderWii::GetName(std::string& _rName, DiscIO::IVolume::ECountry languag
// find Banner type
SWiiBanner* pBanner = (SWiiBanner*)m_pBannerFile;
-#ifdef _WIN32 // FIXME this should NOT be windows specific!!!
-
if (DiscIO::IVolume::COUNTRY_JAP == language)
{
return CopyUnicodeToString(_rName, pBanner->m_Comment[0]);
@@ -138,9 +136,6 @@ CBannerLoaderWii::GetName(std::string& _rName, DiscIO::IVolume::ECountry languag
_rName = StupidWideCharToString(pBanner->m_Comment[0], WII_BANNER_COMMENT_SIZE);
return true;
}
-#else
- _rName = StupidWideCharToString(pBanner->m_Comment[0], WII_BANNER_COMMENT_SIZE);
-#endif
return true;
}