mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-09-02 15:45:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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
commit 703858e217
9 changed files with 31 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Source/Core/DiscIO/Volume.h
View file

@ -8,6 +8,7 @@
#include <limits>
#include <map>
#include <memory>
#include <optional>
#include <string>
#include <vector>
@ -53,8 +54,8 @@ public:
}
virtual std::vector<Partition> GetPartitions() const { return {}; }
virtual Partition GetGamePartition() const { return PARTITION_NONE; }
bool GetTitleID(u64* buffer) const { return GetTitleID(buffer, GetGamePartition()); }
virtual bool GetTitleID(u64* buffer, const Partition& partition) const { return false; }
std::optional<u64> GetTitleID() const { return GetTitleID(GetGamePartition()); }
virtual std::optional<u64> GetTitleID(const Partition& partition) const { return {}; }
virtual const IOS::ES::TicketReader& GetTicket(const Partition& partition) const
{
return INVALID_TICKET;