diff options
| author | Linktothepast <kostamarino@gmail.com> | 2015-09-28 16:50:35 +0300 |
|---|---|---|
| committer | Linktothepast <kostamarino@gmail.com> | 2015-09-28 16:50:35 +0300 |
| commit | 748be565b8df535ef558e74b38cd0f4d615f8a21 (patch) | |
| tree | b151efee0a87e99125f2401325a9bddecf84fc73 /Source/Core/DiscIO/VolumeDirectory.cpp | |
| parent | cf17fccdd3093a1b8476b10183b1c4bde36da74d (diff) | |
| parent | ce493b897d6d3735c930a8465cc0c26bbe5feb86 (diff) | |
Merge remote-tracking branch 'dolphin-emu/master' into gameinis
Diffstat (limited to 'Source/Core/DiscIO/VolumeDirectory.cpp')
| -rw-r--r-- | Source/Core/DiscIO/VolumeDirectory.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/Source/Core/DiscIO/VolumeDirectory.cpp b/Source/Core/DiscIO/VolumeDirectory.cpp index ee22db75ab..fd3e3d8236 100644 --- a/Source/Core/DiscIO/VolumeDirectory.cpp +++ b/Source/Core/DiscIO/VolumeDirectory.cpp @@ -10,10 +10,12 @@ #include <string> #include <vector> +#include "Common/Assert.h" #include "Common/CommonPaths.h" #include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "Common/MathUtil.h" +#include "Common/Logging/Log.h" #include "DiscIO/FileBlob.h" #include "DiscIO/FileMonitor.h" #include "DiscIO/Volume.h" @@ -210,7 +212,7 @@ void CVolumeDirectory::SetName(const std::string& name) m_diskHeader[length + 0x20] = 0; } -u32 CVolumeDirectory::GetFSTSize() const +u64 CVolumeDirectory::GetFSTSize() const { return 0; } @@ -225,6 +227,11 @@ IVolume::EPlatform CVolumeDirectory::GetVolumeType() const return m_is_wii ? WII_DISC : GAMECUBE_DISC; } +bool CVolumeDirectory::IsCompressed() const +{ + return false; +} + u64 CVolumeDirectory::GetSize() const { return 0; @@ -467,10 +474,10 @@ void CVolumeDirectory::WriteEntry(const File::FSTEntry& entry, u32& fstOffset, u // write entry to virtual disk _dbg_assert_(DVDINTERFACE, m_virtualDisk.find(dataOffset) == m_virtualDisk.end()); - m_virtualDisk.insert(make_pair(dataOffset, entry.physicalName)); + m_virtualDisk.emplace(dataOffset, entry.physicalName); // 4 byte aligned - dataOffset = ROUND_UP(dataOffset + entry.size, 0x8000ull); + dataOffset = ROUND_UP(dataOffset + std::max<u64>(entry.size, 1ull), 0x8000ull); } } |