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

Merge pull request #5522 from leoetlino/simpler-gettitleid

Browse Source 
DiscIO: Use std::optional for GetTitleID instead of pointer
This commit is contained in:
JosJuice
2017-06-04 08:57:36 +02:00
committed by GitHub
parent a2bd95a08e 1a17c02d6f
commit 703858e217
9 changed files with 31 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Source/Core/DiscIO/VolumeWiiCrypted.cpp
View File

@ -181,13 +181,12 @@ Partition CVolumeWiiCrypted::GetGamePartition() const
return m_game_partition;
}
bool CVolumeWiiCrypted::GetTitleID(u64* buffer, const Partition& partition) const
std::optional<u64> CVolumeWiiCrypted::GetTitleID(const Partition& partition) const
{
const IOS::ES::TicketReader& ticket = GetTicket(partition);
if (!ticket.IsValid())
return false;
*buffer = ticket.GetTitleId();
return true;
return {};
return ticket.GetTitleId();
}
const IOS::ES::TicketReader& CVolumeWiiCrypted::GetTicket(const Partition& partition) const
@ -289,11 +288,11 @@ std::vector<u32> CVolumeWiiCrypted::GetBanner(int* width, int* height) const
*width = 0;
*height = 0;
u64 title_id;
if (!GetTitleID(&title_id, GetGamePartition()))
const std::optional<u64> title_id = GetTitleID(GetGamePartition());
if (!title_id)
return std::vector<u32>();
return GetWiiBanner(width, height, title_id);
return GetWiiBanner(width, height, *title_id);
}
u64 CVolumeWiiCrypted::GetFSTSize(const Partition& partition) const