diff options
| author | Soren Jorvang <soren.jorvang@gmail.com> | 2010-06-03 20:59:55 +0000 |
|---|---|---|
| committer | Soren Jorvang <soren.jorvang@gmail.com> | 2010-06-03 20:59:55 +0000 |
| commit | ad8232010777dc757fc38bd85527082cc824f982 (patch) | |
| tree | ffdae1728780cc18d0ebed006720f35c9767413d /Source/Core/DiscIO | |
| parent | 5539dd4e8b45c48136d35e822168e09292f1f52d (diff) | |
Make gcc happy.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5596 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/DiscIO')
| -rw-r--r-- | Source/Core/DiscIO/Src/FileSystemGCWii.cpp | 8 | ||||
| -rw-r--r-- | Source/Core/DiscIO/Src/FileSystemGCWii.h | 3 |
2 files changed, 5 insertions, 6 deletions
diff --git a/Source/Core/DiscIO/Src/FileSystemGCWii.cpp b/Source/Core/DiscIO/Src/FileSystemGCWii.cpp index 1d03e00b5c..64d108071a 100644 --- a/Source/Core/DiscIO/Src/FileSystemGCWii.cpp +++ b/Source/Core/DiscIO/Src/FileSystemGCWii.cpp @@ -248,15 +248,15 @@ bool CFileSystemGCWii::DetectFileSystem() if (Read32(0x18) == 0x5D1C9EA3) { m_OffsetShift = 2; // Wii file system + return true; } else if (Read32(0x1c) == 0xC2339F3D) { m_OffsetShift = 0; // GC file system + return true; } - else - { - return false; - } + + return false; } void CFileSystemGCWii::InitFileSystem() diff --git a/Source/Core/DiscIO/Src/FileSystemGCWii.h b/Source/Core/DiscIO/Src/FileSystemGCWii.h index 47fcc417eb..38e5f181f9 100644 --- a/Source/Core/DiscIO/Src/FileSystemGCWii.h +++ b/Source/Core/DiscIO/Src/FileSystemGCWii.h @@ -40,9 +40,8 @@ public: virtual bool ExportDOL(const char* _rExportFolder) const; private: - - bool m_Valid; bool m_Initialized; + bool m_Valid; u32 m_OffsetShift; // WII offsets are all shifted std::vector <SFileInfo> m_FileInfoVector; |