piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-22 22:00:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove Blob nullptr checks from Volume code

Browse Source 
There's no point in creating a volume without a blob,
since essentially all the functionality of a volume
requires a blob to be used.

Also, VolumeCreator doesn't support creating volumes
without blobs (it can't even figure out the volume type
unless it gets a blob), so it's currently impossible
for a volume to be created without a blob.
This commit is contained in:
JosJuice
2016-10-30 23:39:12 +01:00
parent f63d40270d
commit acec02ffc6
3 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Core/DiscIO/VolumeWad.cpp
View File

@ -11,6 +11,7 @@
#include <vector>
#include "Common/Align.h"
#include "Common/Assert.h"
#include "Common/CommonTypes.h"
#include "Common/Logging/Log.h"
#include "Common/MsgHandler.h"
@ -24,6 +25,8 @@ namespace DiscIO
{
CVolumeWAD::CVolumeWAD(std::unique_ptr<IBlobReader> reader) : m_reader(std::move(reader))
{
_assert_(m_reader);
// Source: http://wiibrew.org/wiki/WAD_files
ReadSwapped(0x00, &m_hdr_size, false);
ReadSwapped(0x08, &m_cert_size, false);
@ -57,9 +60,6 @@ bool CVolumeWAD::Read(u64 offset, u64 length, u8* buffer, bool decrypt) const
if (decrypt)
PanicAlertT("Tried to decrypt data from a non-Wii volume");
if (m_reader == nullptr)
return false;
return m_reader->Read(offset, length, buffer);
}
@ -150,17 +150,17 @@ std::vector<u32> CVolumeWAD::GetBanner(int* width, int* height) const
BlobType CVolumeWAD::GetBlobType() const
{
return m_reader ? m_reader->GetBlobType() : BlobType::PLAIN;
return m_reader->GetBlobType();
}
u64 CVolumeWAD::GetSize() const
{
return m_reader ? m_reader->GetDataSize() : 0;
return m_reader->GetDataSize();
}
u64 CVolumeWAD::GetRawSize() const
{
return m_reader ? m_reader->GetRawSize() : 0;
return m_reader->GetRawSize();
}
} // namespace