sgilissen/llamaplayer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move controller creation to System class, switch shared_ptr to unique_ptr

Browse Source
This commit is contained in:
Connor McLaughlin
2019-12-14 23:20:24 +10:00
parent 5fd421860a
commit ea0845d5ad
14 changed files with 56 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/memory_card.cpp
View File

@ -230,16 +230,16 @@ bool MemoryCard::Transfer(const u8 data_in, u8* data_out)
return ack;
}
std::shared_ptr<MemoryCard> MemoryCard::Create(System* system)
std::unique_ptr<MemoryCard> MemoryCard::Create(System* system)
{
auto mc = std::make_shared<MemoryCard>(system);
std::unique_ptr<MemoryCard> mc = std::make_unique<MemoryCard>(system);
mc->Format();
return mc;
}
std::shared_ptr<MemoryCard> MemoryCard::Open(System* system, std::string_view filename)
std::unique_ptr<MemoryCard> MemoryCard::Open(System* system, std::string_view filename)
{
auto mc = std::make_shared<MemoryCard>(system);
std::unique_ptr<MemoryCard> mc = std::make_unique<MemoryCard>(system);
mc->m_filename = filename;
if (!mc->LoadFromFile())
{