ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GCMemcardDirectory: Rewrite migration logic without ExportGci().

This commit is contained in:
Admiral H. Curtiss 2020-08-01 01:44:07 +02:00
parent e8b99d3afd
commit 645cb2f3d1
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Source/Core/Core/HW/GCMemcard/GCMemcardDirectory.cpp
View File

@ -17,6 +17,7 @@
#include "Common/Assert.h" #include "Common/Assert.h"
#include "Common/ChunkFile.h" #include "Common/ChunkFile.h"
#include "Common/CommonPaths.h"
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "Common/Config/Config.h" #include "Common/Config/Config.h"
#include "Common/FileSearch.h" #include "Common/FileSearch.h"
@ -32,6 +33,8 @@
#include "Core/ConfigManager.h" #include "Core/ConfigManager.h"
#include "Core/Core.h" #include "Core/Core.h"
#include "Core/HW/EXI/EXI_DeviceIPL.h" #include "Core/HW/EXI/EXI_DeviceIPL.h"
#include "Core/HW/GCMemcard/GCMemcard.h"
#include "Core/HW/GCMemcard/GCMemcardUtils.h"
#include "Core/HW/Sram.h" #include "Core/HW/Sram.h"
#include "Core/NetPlayProto.h" #include "Core/NetPlayProto.h"
@ -716,7 +719,13 @@ void MigrateFromMemcardFile(const std::string& directory_name, int card_index)
{ {
for (u8 i = 0; i < Memcard::DIRLEN; i++) for (u8 i = 0; i < Memcard::DIRLEN; i++)
{ {
memcard->ExportGci(i, "", directory_name); const auto savefile = memcard->ExportFile(i);
if (!savefile)
continue;
std::string filepath =
directory_name + DIR_SEP + Memcard::GenerateFilename(savefile->dir_entry) + ".gci";
Memcard::WriteSavefile(filepath, *savefile, Memcard::SavefileFormat::GCI);
} }
} }
} }