diff options
Diffstat (limited to 'Source/Core/DiscIO')
| -rw-r--r-- | Source/Core/DiscIO/Src/FileBlob.cpp | 23 | ||||
| -rw-r--r-- | Source/Core/DiscIO/Src/FileSystemGCWii.h | 4 |
2 files changed, 24 insertions, 3 deletions
diff --git a/Source/Core/DiscIO/Src/FileBlob.cpp b/Source/Core/DiscIO/Src/FileBlob.cpp index d3465140ae..af456a2734 100644 --- a/Source/Core/DiscIO/Src/FileBlob.cpp +++ b/Source/Core/DiscIO/Src/FileBlob.cpp @@ -20,8 +20,20 @@ #include "Blob.h" #include "FileBlob.h" + +////////////////////////////////////////////////// +// Music mod +// ŻŻŻŻŻŻŻŻŻŻ +#include "../../../../Branches/MusicMod/Main/Src/Setup.h" // Define MUSICMOD here +#ifdef MUSICMOD + #include "../../../../Branches/MusicMod/Main/Src/Main.h" +#endif +/////////////////////// + + + #ifdef _WIN32 -#include <windows.h> + #include <windows.h> #endif namespace DiscIO @@ -55,6 +67,15 @@ PlainFileReader::~PlainFileReader() bool PlainFileReader::Read(u64 offset, u64 nbytes, u8* out_ptr) { + ////////////////////////////////////////////////// + // Music mod + // ŻŻŻŻŻŻŻŻŻŻ + #ifdef MUSICMOD + MusicMod::CheckFile(offset, size); + #endif + /////////////////////// + + LONG offset_high = (LONG)(offset >> 32); SetFilePointer(hFile, (DWORD)(offset & 0xFFFFFFFF), &offset_high, FILE_BEGIN); diff --git a/Source/Core/DiscIO/Src/FileSystemGCWii.h b/Source/Core/DiscIO/Src/FileSystemGCWii.h index 3cb1359c01..dded1c17e1 100644 --- a/Source/Core/DiscIO/Src/FileSystemGCWii.h +++ b/Source/Core/DiscIO/Src/FileSystemGCWii.h @@ -37,9 +37,9 @@ public: virtual bool ExportFile(const char* _rFullPath, const char* _rExportFilename) const; virtual bool ExportAllFiles(const char* _rFullPath) const; + std::vector <SFileInfo> m_FileInfoVector; // Public for the music modification -private: - std::vector <SFileInfo> m_FileInfoVector; +private: bool m_Initialized; u32 m_OffsetShift; // WII offsets are all shifted |