PrimeDecomp/prime
2
0
Fork 0
mirror of https://github.com/PrimeDecomp/prime.git synced 2025-12-12 17:26:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use a struct instead of pair for x198_fileInfo

Browse Source 
Former-commit-id: 1d323af190
This commit is contained in:
Henrique Gemignani Passos Lima
2022-10-12 01:37:14 +03:00
parent 756f43e2d6
commit 49a74b70e9
4 changed files with 40 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/MetroidPrime/CMemoryCardDriver.hpp
View File

@@ -17,8 +17,8 @@ struct SMemoryCardFileInfo {
CMemoryCardSys::CardFileHandle x0_fileInfo;
rstl::string x14_name;
rstl::vector< u8 > x24_saveFileData;
rstl::vector< u8 > x34_saveData;
rstl::vector< uchar > x24_saveFileData;
rstl::vector< char > x34_saveData;
SMemoryCardFileInfo(int cardPort, const rstl::string& name);
SMemoryCardFileInfo(const SMemoryCardFileInfo& other)
@@ -26,6 +26,7 @@ struct SMemoryCardFileInfo {
, x14_name(other.x14_name)
, x24_saveFileData(other.x24_saveFileData)
, x34_saveData(other.x34_saveData) {}
~SMemoryCardFileInfo() {}
ECardResult Open();
ECardResult Close();
@@ -117,6 +118,17 @@ public:
};
enum EFileState { kFS_Unknown, kFS_NoFile, kFS_File, kFS_BadFile };
struct SFileInfo {
EFileState first;
SMemoryCardFileInfo second;
SFileInfo(EFileState state, int cardPort, const rstl::string& name)
: first(state)
, second(cardPort, name)
{}
~SFileInfo();
};
private:
CMemoryCardSys::EMemoryCardPort x0_cardPort;
CAssetId x4_saveBanner;
@@ -130,7 +142,7 @@ private:
long long x28_cardSerial;
rstl::reserved_vector< u8, 174 > x30_systemData;
rstl::reserved_vector< rstl::auto_ptr< SGameFileSlot >, 3 > xe4_fileSlots;
rstl::reserved_vector< rstl::pair< EFileState, SMemoryCardFileInfo >, 2 > x100_mcFileInfos;
rstl::reserved_vector< SFileInfo, 2 > x100_mcFileInfos;
int x194_fileIdx;
rstl::single_ptr< CMemoryCardSys::CCardFileInfo > x198_fileInfo;
bool x19c_;