We hate pointer games, don't we?

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@597 8ced0084-cf51-0410-be5f-012b33b47a6e

7 files changed, 15 insertions, 15 deletions

diff --git a/Source/Core/DiscIO/Src/BannerLoaderWii.cpp b/Source/Core/DiscIO/Src/BannerLoaderWii.cpp
index 4744223d9a..8e5bb173cc 100644
--- a/Source/Core/DiscIO/Src/BannerLoaderWii.cpp
+++ b/Source/Core/DiscIO/Src/BannerLoaderWii.cpp
@@ -64,7 +64,7 @@ CBannerLoaderWii::CBannerLoaderWii(DiscIO::IFileSystem& _rFileSystem)
 	}

 

 

-	m_Name = std::string("Wii: ") + _rFileSystem.GetVolume().GetName();

+	m_Name = std::string("Wii: ") + _rFileSystem.GetVolume()->GetName();

 }

 

 

diff --git a/Source/Core/DiscIO/Src/FileSystemGCWii.cpp b/Source/Core/DiscIO/Src/FileSystemGCWii.cpp
index 5a23256f6b..2fd477526f 100644
--- a/Source/Core/DiscIO/Src/FileSystemGCWii.cpp
+++ b/Source/Core/DiscIO/Src/FileSystemGCWii.cpp
@@ -25,7 +25,7 @@
 

 namespace DiscIO

 {

-CFileSystemGCWii::CFileSystemGCWii(const IVolume& _rVolume)

+CFileSystemGCWii::CFileSystemGCWii(const IVolume *_rVolume)

 	: IFileSystem(_rVolume),

 	m_Initialized(false),

 	m_OffsetShift(0)

@@ -106,7 +106,7 @@ CFileSystemGCWii::ReadFile(const char* _rFullPath, u8* _pBuffer, size_t _MaxBuff
 		return(0);

 	}

 

-	m_rVolume.Read(pFileInfo->m_Offset, pFileInfo->m_FileSize, _pBuffer);

+	m_rVolume->Read(pFileInfo->m_Offset, pFileInfo->m_FileSize, _pBuffer);

 	return(pFileInfo->m_FileSize);

 }

 

@@ -155,14 +155,14 @@ u32
 CFileSystemGCWii::Read32(u64 _Offset) const

 {

 	u32 Temp = 0;

-	m_rVolume.Read(_Offset, 4, (u8*)&Temp);

+	m_rVolume->Read(_Offset, 4, (u8*)&Temp);

 	return(Common::swap32(Temp));

 }

 

 

 void CFileSystemGCWii::GetStringFromOffset(u64 _Offset, char* Filename) const

 {

-	m_rVolume.Read(_Offset, 255, (u8*)Filename);

+	m_rVolume->Read(_Offset, 255, (u8*)Filename);

 }

 

 size_t CFileSystemGCWii::GetFileList(std::vector<SFileInfo *> &_rFilenames)

diff --git a/Source/Core/DiscIO/Src/FileSystemGCWii.h b/Source/Core/DiscIO/Src/FileSystemGCWii.h
index f90d06ffe6..19e57bfbc7 100644
--- a/Source/Core/DiscIO/Src/FileSystemGCWii.h
+++ b/Source/Core/DiscIO/Src/FileSystemGCWii.h
@@ -29,7 +29,7 @@ class CFileSystemGCWii
 {

 	public:

 

-		CFileSystemGCWii(const IVolume& _rVolume);

+		CFileSystemGCWii(const IVolume *_rVolume);

 

 		virtual ~CFileSystemGCWii();

 

diff --git a/Source/Core/DiscIO/Src/Filesystem.cpp b/Source/Core/DiscIO/Src/Filesystem.cpp
index 3c92056cee..bbbd04c0b1 100644
--- a/Source/Core/DiscIO/Src/Filesystem.cpp
+++ b/Source/Core/DiscIO/Src/Filesystem.cpp
@@ -23,7 +23,7 @@
 

 namespace DiscIO

 {

-IFileSystem::IFileSystem(const IVolume& _rVolume)

+IFileSystem::IFileSystem(const IVolume *_rVolume)

 	: m_rVolume(_rVolume)

 {}

 

@@ -32,7 +32,7 @@ IFileSystem::~IFileSystem()
 {}

 

 

-IFileSystem* CreateFileSystem(const IVolume& _rVolume)

+IFileSystem* CreateFileSystem(const IVolume* _rVolume)

 {

 	IFileSystem* pFileSystem = new CFileSystemGCWii(_rVolume);

 

diff --git a/Source/Core/DiscIO/Src/Filesystem.h b/Source/Core/DiscIO/Src/Filesystem.h
index 7b319518a0..c794864e98 100644
--- a/Source/Core/DiscIO/Src/Filesystem.h
+++ b/Source/Core/DiscIO/Src/Filesystem.h
@@ -46,7 +46,7 @@ class IFileSystem
 {

 	public:

 

-		IFileSystem(const IVolume& _rVolume);

+		IFileSystem(const IVolume *_rVolume);

 

 		virtual ~IFileSystem();

 

@@ -66,15 +66,15 @@ class IFileSystem
 		virtual const char* GetFileName(u64 _Address) = 0;

 

 

-		virtual const IVolume& GetVolume() {return(m_rVolume);}

+		virtual const IVolume *GetVolume() {return(m_rVolume);}

 

 

 	protected:

 

-		const IVolume& m_rVolume;

+		const IVolume *m_rVolume;

 };

 

-IFileSystem* CreateFileSystem(const IVolume& _rVolume);

+IFileSystem* CreateFileSystem(const IVolume *_rVolume);

 } // namespace

 

 #endif

diff --git a/Source/Core/DiscIO/Src/VolumeCreator.cpp b/Source/Core/DiscIO/Src/VolumeCreator.cpp
index 1291d6d2fc..e7b051f9bb 100644
--- a/Source/Core/DiscIO/Src/VolumeCreator.cpp
+++ b/Source/Core/DiscIO/Src/VolumeCreator.cpp
@@ -103,10 +103,10 @@ IVolume* CreateVolumeFromFilename(const std::string& _rFilename)
 	return NULL;

 }

 

-bool IsVolumeWiiDisc(const IVolume& _rVolume)

+bool IsVolumeWiiDisc(const IVolume *_rVolume)

 {

 	u32 MagicWord = 0;

-	_rVolume.Read(0x18, 4, (u8*)&MagicWord);

+	_rVolume->Read(0x18, 4, (u8*)&MagicWord);

 

 	return (Common::swap32(MagicWord) == 0x5D1C9EA3);

 }

diff --git a/Source/Core/DiscIO/Src/VolumeCreator.h b/Source/Core/DiscIO/Src/VolumeCreator.h
index 0975f567c9..ad5f5d17fd 100644
--- a/Source/Core/DiscIO/Src/VolumeCreator.h
+++ b/Source/Core/DiscIO/Src/VolumeCreator.h
@@ -23,7 +23,7 @@
 namespace DiscIO

 {

 IVolume* CreateVolumeFromFilename(const std::string& _rFilename);

-bool IsVolumeWiiDisc(const IVolume& _rVolume);

+bool IsVolumeWiiDisc(const IVolume *_rVolume);

 } // namespace

 

 #endif