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

GCMemcard: Rename DEntry variables to match our naming conventions.

This commit is contained in:
Admiral H. Curtiss 2018-11-18 15:33:36 +01:00
parent c419dac1d8
commit 15f89d3e6f
4 changed files with 106 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

124
Source/Core/Core/HW/GCMemcard/GCMemcard.cpp
View File

@ -327,7 +327,7 @@ u8 GCMemcard::GetNumFiles() const
u8 j = 0; u8 j = 0;
for (int i = 0; i < DIRLEN; i++) for (int i = 0; i < DIRLEN; i++)
{ {
if (BE32(CurrentDir->Dir[i].Gamecode) != 0xFFFFFFFF) if (BE32(CurrentDir->Dir[i].m_gamecode) != 0xFFFFFFFF)
j++; j++;
} }
return j; return j;
@ -340,7 +340,7 @@ u8 GCMemcard::GetFileIndex(u8 fileNumber) const
u8 j = 0; u8 j = 0;
for (u8 i = 0; i < DIRLEN; i++) for (u8 i = 0; i < DIRLEN; i++)
{ {
if (BE32(CurrentDir->Dir[i].Gamecode) != 0xFFFFFFFF) if (BE32(CurrentDir->Dir[i].m_gamecode) != 0xFFFFFFFF)
{ {
if (j == fileNumber) if (j == fileNumber)
{ {
@ -369,8 +369,8 @@ u8 GCMemcard::TitlePresent(const DEntry& d) const
u8 i = 0; u8 i = 0;
while (i < DIRLEN) while (i < DIRLEN)
{ {
if ((BE32(CurrentDir->Dir[i].Gamecode) == BE32(d.Gamecode)) && if ((BE32(CurrentDir->Dir[i].m_gamecode) == BE32(d.m_gamecode)) &&
(!memcmp(CurrentDir->Dir[i].Filename, d.Filename, 32))) (!memcmp(CurrentDir->Dir[i].m_filename, d.m_filename, 32)))
{ {
break; break;
} }
@ -381,7 +381,7 @@ u8 GCMemcard::TitlePresent(const DEntry& d) const
bool GCMemcard::GCI_FileName(u8 index, std::string& filename) const bool GCMemcard::GCI_FileName(u8 index, std::string& filename) const
{ {
if (!m_valid || index >= DIRLEN || (BE32(CurrentDir->Dir[index].Gamecode) == 0xFFFFFFFF)) if (!m_valid || index >= DIRLEN || (BE32(CurrentDir->Dir[index].m_gamecode) == 0xFFFFFFFF))
return false; return false;
filename = CurrentDir->Dir[index].GCI_FileName(); filename = CurrentDir->Dir[index].GCI_FileName();
@ -396,7 +396,7 @@ std::string GCMemcard::DEntry_GameCode(u8 index) const
if (!m_valid || index >= DIRLEN) if (!m_valid || index >= DIRLEN)
return ""; return "";
return std::string((const char*)CurrentDir->Dir[index].Gamecode, 4); return std::string((const char*)CurrentDir->Dir[index].m_gamecode, 4);
} }
std::string GCMemcard::DEntry_Makercode(u8 index) const std::string GCMemcard::DEntry_Makercode(u8 index) const
@ -404,7 +404,7 @@ std::string GCMemcard::DEntry_Makercode(u8 index) const
if (!m_valid || index >= DIRLEN) if (!m_valid || index >= DIRLEN)
return ""; return "";
return std::string((const char*)CurrentDir->Dir[index].Makercode, 2); return std::string((const char*)CurrentDir->Dir[index].m_makercode, 2);
} }
std::string GCMemcard::DEntry_BIFlags(u8 index) const std::string GCMemcard::DEntry_BIFlags(u8 index) const
@ -413,7 +413,7 @@ std::string GCMemcard::DEntry_BIFlags(u8 index) const
return ""; return "";
std::string flags; std::string flags;
int x = CurrentDir->Dir[index].BIFlags; int x = CurrentDir->Dir[index].m_banner_and_icon_flags;
for (int i = 0; i < 8; i++) for (int i = 0; i < 8; i++)
{ {
flags.push_back((x & 0x80) ? '1' : '0'); flags.push_back((x & 0x80) ? '1' : '0');
@ -427,7 +427,7 @@ std::string GCMemcard::DEntry_FileName(u8 index) const
if (!m_valid || index >= DIRLEN) if (!m_valid || index >= DIRLEN)
return ""; return "";
return std::string((const char*)CurrentDir->Dir[index].Filename, DENTRY_STRLEN); return std::string((const char*)CurrentDir->Dir[index].m_filename, DENTRY_STRLEN);
} }
u32 GCMemcard::DEntry_ModTime(u8 index) const u32 GCMemcard::DEntry_ModTime(u8 index) const
@ -435,7 +435,7 @@ u32 GCMemcard::DEntry_ModTime(u8 index) const
if (!m_valid || index >= DIRLEN) if (!m_valid || index >= DIRLEN)
return 0xFFFFFFFF; return 0xFFFFFFFF;
return BE32(CurrentDir->Dir[index].ModTime); return BE32(CurrentDir->Dir[index].m_modification_time);
} }
u32 GCMemcard::DEntry_ImageOffset(u8 index) const u32 GCMemcard::DEntry_ImageOffset(u8 index) const
@ -443,7 +443,7 @@ u32 GCMemcard::DEntry_ImageOffset(u8 index) const
if (!m_valid || index >= DIRLEN) if (!m_valid || index >= DIRLEN)
return 0xFFFFFFFF; return 0xFFFFFFFF;
return BE32(CurrentDir->Dir[index].ImageOffset); return BE32(CurrentDir->Dir[index].m_image_offset);
} }
std::string GCMemcard::DEntry_IconFmt(u8 index) const std::string GCMemcard::DEntry_IconFmt(u8 index) const
@ -451,12 +451,12 @@ std::string GCMemcard::DEntry_IconFmt(u8 index) const
if (!m_valid || index >= DIRLEN) if (!m_valid || index >= DIRLEN)
return ""; return "";
int x = CurrentDir->Dir[index].IconFmt[0]; int x = CurrentDir->Dir[index].m_icon_format[0];
std::string format; std::string format;
for (int i = 0; i < 16; i++) for (int i = 0; i < 16; i++)
{ {
if (i == 8) if (i == 8)
x = CurrentDir->Dir[index].IconFmt[1]; x = CurrentDir->Dir[index].m_icon_format[1];
format.push_back((x & 0x80) ? '1' : '0'); format.push_back((x & 0x80) ? '1' : '0');
x = x << 1; x = x << 1;
} }
@ -468,12 +468,12 @@ std::string GCMemcard::DEntry_AnimSpeed(u8 index) const
if (!m_valid || index >= DIRLEN) if (!m_valid || index >= DIRLEN)
return ""; return "";
int x = CurrentDir->Dir[index].AnimSpeed[0]; int x = CurrentDir->Dir[index].m_animation_speed[0];
std::string speed; std::string speed;
for (int i = 0; i < 16; i++) for (int i = 0; i < 16; i++)
{ {
if (i == 8) if (i == 8)
x = CurrentDir->Dir[index].AnimSpeed[1]; x = CurrentDir->Dir[index].m_animation_speed[1];
speed.push_back((x & 0x80) ? '1' : '0'); speed.push_back((x & 0x80) ? '1' : '0');
x = x << 1; x = x << 1;
} }
@ -485,7 +485,7 @@ std::string GCMemcard::DEntry_Permissions(u8 index) const
if (!m_valid || index >= DIRLEN) if (!m_valid || index >= DIRLEN)
return ""; return "";
u8 Permissions = CurrentDir->Dir[index].Permissions; u8 Permissions = CurrentDir->Dir[index].m_file_permissions;
std::string permissionsString; std::string permissionsString;
permissionsString.push_back((Permissions & 16) ? 'x' : 'M'); permissionsString.push_back((Permissions & 16) ? 'x' : 'M');
permissionsString.push_back((Permissions & 8) ? 'x' : 'C'); permissionsString.push_back((Permissions & 8) ? 'x' : 'C');
@ -498,7 +498,7 @@ u8 GCMemcard::DEntry_CopyCounter(u8 index) const
if (!m_valid || index >= DIRLEN) if (!m_valid || index >= DIRLEN)
return 0xFF; return 0xFF;
return CurrentDir->Dir[index].CopyCounter; return CurrentDir->Dir[index].m_copy_counter;
} }
u16 GCMemcard::DEntry_FirstBlock(u8 index) const u16 GCMemcard::DEntry_FirstBlock(u8 index) const
@ -506,7 +506,7 @@ u16 GCMemcard::DEntry_FirstBlock(u8 index) const
if (!m_valid || index >= DIRLEN) if (!m_valid || index >= DIRLEN)
return 0xFFFF; return 0xFFFF;
u16 block = BE16(CurrentDir->Dir[index].FirstBlock); u16 block = BE16(CurrentDir->Dir[index].m_first_block);
if (block > (u16)maxBlock) if (block > (u16)maxBlock)
return 0xFFFF; return 0xFFFF;
return block; return block;
@ -517,7 +517,7 @@ u16 GCMemcard::DEntry_BlockCount(u8 index) const
if (!m_valid || index >= DIRLEN) if (!m_valid || index >= DIRLEN)
return 0xFFFF; return 0xFFFF;
u16 blocks = BE16(CurrentDir->Dir[index].BlockCount); u16 blocks = BE16(CurrentDir->Dir[index].m_block_count);
if (blocks > (u16)maxBlock) if (blocks > (u16)maxBlock)
return 0xFFFF; return 0xFFFF;
return blocks; return blocks;
@ -528,7 +528,7 @@ u32 GCMemcard::DEntry_CommentsAddress(u8 index) const
if (!m_valid || index >= DIRLEN) if (!m_valid || index >= DIRLEN)
return 0xFFFF; return 0xFFFF;
return BE32(CurrentDir->Dir[index].CommentsAddr); return BE32(CurrentDir->Dir[index].m_comments_address);
} }
std::string GCMemcard::GetSaveComment1(u8 index) const std::string GCMemcard::GetSaveComment1(u8 index) const
@ -536,8 +536,8 @@ std::string GCMemcard::GetSaveComment1(u8 index) const
if (!m_valid || index >= DIRLEN) if (!m_valid || index >= DIRLEN)
return ""; return "";
u32 Comment1 = BE32(CurrentDir->Dir[index].CommentsAddr); u32 Comment1 = BE32(CurrentDir->Dir[index].m_comments_address);
u32 DataBlock = BE16(CurrentDir->Dir[index].FirstBlock) - MC_FST_BLOCKS; u32 DataBlock = BE16(CurrentDir->Dir[index].m_first_block) - MC_FST_BLOCKS;
if ((DataBlock > maxBlock) || (Comment1 == 0xFFFFFFFF)) if ((DataBlock > maxBlock) || (Comment1 == 0xFFFFFFFF))
{ {
return ""; return "";
@ -550,9 +550,9 @@ std::string GCMemcard::GetSaveComment2(u8 index) const
if (!m_valid || index >= DIRLEN) if (!m_valid || index >= DIRLEN)
return ""; return "";
u32 Comment1 = BE32(CurrentDir->Dir[index].CommentsAddr); u32 Comment1 = BE32(CurrentDir->Dir[index].m_comments_address);
u32 Comment2 = Comment1 + DENTRY_STRLEN; u32 Comment2 = Comment1 + DENTRY_STRLEN;
u32 DataBlock = BE16(CurrentDir->Dir[index].FirstBlock) - MC_FST_BLOCKS; u32 DataBlock = BE16(CurrentDir->Dir[index].m_first_block) - MC_FST_BLOCKS;
if ((DataBlock > maxBlock) || (Comment1 == 0xFFFFFFFF)) if ((DataBlock > maxBlock) || (Comment1 == 0xFFFFFFFF))
{ {
return ""; return "";
@ -655,7 +655,7 @@ u32 GCMemcard::ImportFile(const DEntry& direntry, std::vector<GCMBlock>& saveBlo
{ {
return OUTOFDIRENTRIES; return OUTOFDIRENTRIES;
} }
if (BE16(CurrentBat->FreeBlocks) < BE16(direntry.BlockCount)) if (BE16(CurrentBat->FreeBlocks) < BE16(direntry.m_block_count))
{ {
return OUTOFBLOCKS; return OUTOFBLOCKS;
} }
@ -673,11 +673,11 @@ u32 GCMemcard::ImportFile(const DEntry& direntry, std::vector<GCMBlock>& saveBlo
// find first free dir entry // find first free dir entry
for (int i = 0; i < DIRLEN; i++) for (int i = 0; i < DIRLEN; i++)
{ {
if (BE32(UpdatedDir.Dir[i].Gamecode) == 0xFFFFFFFF) if (BE32(UpdatedDir.Dir[i].m_gamecode) == 0xFFFFFFFF)
{ {
UpdatedDir.Dir[i] = direntry; UpdatedDir.Dir[i] = direntry;
*(u16*)&UpdatedDir.Dir[i].FirstBlock = BE16(firstBlock); *(u16*)&UpdatedDir.Dir[i].m_first_block = BE16(firstBlock);
UpdatedDir.Dir[i].CopyCounter = UpdatedDir.Dir[i].CopyCounter + 1; UpdatedDir.Dir[i].m_copy_counter = UpdatedDir.Dir[i].m_copy_counter + 1;
break; break;
} }
} }
@ -694,7 +694,7 @@ u32 GCMemcard::ImportFile(const DEntry& direntry, std::vector<GCMBlock>& saveBlo
PreviousDir = &dir; PreviousDir = &dir;
} }
int fileBlocks = BE16(direntry.BlockCount); int fileBlocks = BE16(direntry.m_block_count);
FZEROGX_MakeSaveGameValid(hdr, direntry, saveBlocks); FZEROGX_MakeSaveGameValid(hdr, direntry, saveBlocks);
PSO_MakeSaveGameValid(hdr, direntry, saveBlocks); PSO_MakeSaveGameValid(hdr, direntry, saveBlocks);
@ -742,8 +742,8 @@ u32 GCMemcard::RemoveFile(u8 index) // index in the directory array
if (index >= DIRLEN) if (index >= DIRLEN)
return DELETE_FAIL; return DELETE_FAIL;
u16 startingblock = BE16(CurrentDir->Dir[index].FirstBlock); u16 startingblock = BE16(CurrentDir->Dir[index].m_first_block);
u16 numberofblocks = BE16(CurrentDir->Dir[index].BlockCount); u16 numberofblocks = BE16(CurrentDir->Dir[index].m_block_count);
BlockAlloc UpdatedBat = *CurrentBat; BlockAlloc UpdatedBat = *CurrentBat;
if (!UpdatedBat.ClearBlocks(startingblock, numberofblocks)) if (!UpdatedBat.ClearBlocks(startingblock, numberofblocks))
@ -765,10 +765,10 @@ u32 GCMemcard::RemoveFile(u8 index) // index in the directory array
/* /*
// TODO: determine when this is used, even on the same memory card I have seen // TODO: determine when this is used, even on the same memory card I have seen
// both update to broken file, and not updated // both update to broken file, and not updated
*(u32*)&UpdatedDir.Dir[index].Gamecode = 0; *(u32*)&UpdatedDir.Dir[index].m_gamecode = 0;
*(u16*)&UpdatedDir.Dir[index].Makercode = 0; *(u16*)&UpdatedDir.Dir[index].m_makercode = 0;
memset(UpdatedDir.Dir[index].Filename, 0, 0x20); memset(UpdatedDir.Dir[index].m_filename, 0, 0x20);
strcpy((char*)UpdatedDir.Dir[index].Filename, "Broken File000"); strcpy((char*)UpdatedDir.Dir[index].m_filename, "Broken File000");
*(u16*)&UpdatedDir.UpdateCounter = BE16(BE16(UpdatedDir.UpdateCounter) + 1); *(u16*)&UpdatedDir.UpdateCounter = BE16(BE16(UpdatedDir.UpdateCounter) + 1);
*PreviousDir = UpdatedDir; *PreviousDir = UpdatedDir;
@ -882,12 +882,12 @@ u32 GCMemcard::ImportGciInternal(File::IOFile&& gci, const std::string& inputFil
Gcs_SavConvert(tempDEntry, offset, length); Gcs_SavConvert(tempDEntry, offset, length);
if (length != BE16(tempDEntry.BlockCount) * BLOCK_SIZE) if (length != BE16(tempDEntry.m_block_count) * BLOCK_SIZE)
return LENGTHFAIL; return LENGTHFAIL;
if (gci.Tell() != offset + DENTRY_SIZE) // Verify correct file position if (gci.Tell() != offset + DENTRY_SIZE) // Verify correct file position
return OPENFAIL; return OPENFAIL;
u32 size = BE16((tempDEntry.BlockCount)); u32 size = BE16((tempDEntry.m_block_count));
std::vector<GCMBlock> saveData; std::vector<GCMBlock> saveData;
saveData.reserve(size); saveData.reserve(size);
@ -910,7 +910,7 @@ u32 GCMemcard::ImportGciInternal(File::IOFile&& gci, const std::string& inputFil
if (!gci2.WriteBytes(&tempDEntry, DENTRY_SIZE)) if (!gci2.WriteBytes(&tempDEntry, DENTRY_SIZE))
completeWrite = false; completeWrite = false;
int fileBlocks = BE16(tempDEntry.BlockCount); int fileBlocks = BE16(tempDEntry.m_block_count);
gci2.Seek(DENTRY_SIZE, SEEK_SET); gci2.Seek(DENTRY_SIZE, SEEK_SET);
for (int i = 0; i < fileBlocks; ++i) for (int i = 0; i < fileBlocks; ++i)
@ -1028,7 +1028,7 @@ void GCMemcard::Gcs_SavConvert(DEntry& tempDEntry, int saveType, int length)
// It is stored only within the corresponding GSV file. // It is stored only within the corresponding GSV file.
// If the GCS file is added without using the GameSaves software, // If the GCS file is added without using the GameSaves software,
// the value stored is always "1" // the value stored is always "1"
*(u16*)&tempDEntry.BlockCount = BE16(length / BLOCK_SIZE); *(u16*)&tempDEntry.m_block_count = BE16(length / BLOCK_SIZE);
} }
break; break;
case SAV: case SAV:
@ -1036,18 +1036,18 @@ void GCMemcard::Gcs_SavConvert(DEntry& tempDEntry, int saveType, int length)
// 0x2C and 0x2D, 0x2E and 0x2F, 0x30 and 0x31, 0x32 and 0x33, // 0x2C and 0x2D, 0x2E and 0x2F, 0x30 and 0x31, 0x32 and 0x33,
// 0x34 and 0x35, 0x36 and 0x37, 0x38 and 0x39, 0x3A and 0x3B, // 0x34 and 0x35, 0x36 and 0x37, 0x38 and 0x39, 0x3A and 0x3B,
// 0x3C and 0x3D,0x3E and 0x3F. // 0x3C and 0x3D,0x3E and 0x3F.
// It seems that sav files also swap the BIFlags... // It seems that sav files also swap the banner/icon flags...
ByteSwap(&tempDEntry.Unused1, &tempDEntry.BIFlags); ByteSwap(&tempDEntry.m_unused_1, &tempDEntry.m_banner_and_icon_flags);
ArrayByteSwap((tempDEntry.ImageOffset)); ArrayByteSwap((tempDEntry.m_image_offset));
ArrayByteSwap(&(tempDEntry.ImageOffset[2])); ArrayByteSwap(&(tempDEntry.m_image_offset[2]));
ArrayByteSwap((tempDEntry.IconFmt)); ArrayByteSwap((tempDEntry.m_icon_format));
ArrayByteSwap((tempDEntry.AnimSpeed)); ArrayByteSwap((tempDEntry.m_animation_speed));
ByteSwap(&tempDEntry.Permissions, &tempDEntry.CopyCounter); ByteSwap(&tempDEntry.m_file_permissions, &tempDEntry.m_copy_counter);
ArrayByteSwap((tempDEntry.FirstBlock)); ArrayByteSwap((tempDEntry.m_first_block));
ArrayByteSwap((tempDEntry.BlockCount)); ArrayByteSwap((tempDEntry.m_block_count));
ArrayByteSwap((tempDEntry.Unused2)); ArrayByteSwap((tempDEntry.m_unused_2));
ArrayByteSwap((tempDEntry.CommentsAddr)); ArrayByteSwap((tempDEntry.m_comments_address));
ArrayByteSwap(&(tempDEntry.CommentsAddr[2])); ArrayByteSwap(&(tempDEntry.m_comments_address[2]));
break; break;
default: default:
break; break;
@ -1059,7 +1059,7 @@ bool GCMemcard::ReadBannerRGBA8(u8 index, u32* buffer) const
if (!m_valid || index >= DIRLEN) if (!m_valid || index >= DIRLEN)
return false; return false;
int flags = CurrentDir->Dir[index].BIFlags; int flags = CurrentDir->Dir[index].m_banner_and_icon_flags;
// Timesplitters 2 is the only game that I see this in // Timesplitters 2 is the only game that I see this in
// May be a hack // May be a hack
if (flags == 0xFB) if (flags == 0xFB)
@ -1070,8 +1070,8 @@ bool GCMemcard::ReadBannerRGBA8(u8 index, u32* buffer) const
if (bnrFormat == 0) if (bnrFormat == 0)
return false; return false;
u32 DataOffset = BE32(CurrentDir->Dir[index].ImageOffset); u32 DataOffset = BE32(CurrentDir->Dir[index].m_image_offset);
u32 DataBlock = BE16(CurrentDir->Dir[index].FirstBlock) - MC_FST_BLOCKS; u32 DataBlock = BE16(CurrentDir->Dir[index].m_first_block) - MC_FST_BLOCKS;
if ((DataBlock > maxBlock) || (DataOffset == 0xFFFFFFFF)) if ((DataBlock > maxBlock) || (DataOffset == 0xFFFFFFFF))
{ {
@ -1105,10 +1105,10 @@ u32 GCMemcard::ReadAnimRGBA8(u8 index, u32* buffer, u8* delays) const
// Sonic Heroes it the only game I have seen that tries to use a CI8 and RGB5A3 icon // Sonic Heroes it the only game I have seen that tries to use a CI8 and RGB5A3 icon
// int fmtCheck = 0; // int fmtCheck = 0;
int formats = BE16(CurrentDir->Dir[index].IconFmt); int formats = BE16(CurrentDir->Dir[index].m_icon_format);
int fdelays = BE16(CurrentDir->Dir[index].AnimSpeed); int fdelays = BE16(CurrentDir->Dir[index].m_animation_speed);
int flags = CurrentDir->Dir[index].BIFlags; int flags = CurrentDir->Dir[index].m_banner_and_icon_flags;
// Timesplitters 2 and 3 is the only game that I see this in // Timesplitters 2 and 3 is the only game that I see this in
// May be a hack // May be a hack
// if (flags == 0xFB) flags = ~flags; // if (flags == 0xFB) flags = ~flags;
@ -1117,8 +1117,8 @@ u32 GCMemcard::ReadAnimRGBA8(u8 index, u32* buffer, u8* delays) const
int bnrFormat = (flags & 3); int bnrFormat = (flags & 3);
u32 DataOffset = BE32(CurrentDir->Dir[index].ImageOffset); u32 DataOffset = BE32(CurrentDir->Dir[index].m_image_offset);
u32 DataBlock = BE16(CurrentDir->Dir[index].FirstBlock) - MC_FST_BLOCKS; u32 DataBlock = BE16(CurrentDir->Dir[index].m_first_block) - MC_FST_BLOCKS;
if ((DataBlock > maxBlock) || (DataOffset == 0xFFFFFFFF)) if ((DataBlock > maxBlock) || (DataOffset == 0xFFFFFFFF))
{ {
@ -1290,7 +1290,7 @@ s32 GCMemcard::FZEROGX_MakeSaveGameValid(const Header& cardheader, const DEntry&
int block = 0; int block = 0;
// check for F-Zero GX system file // check for F-Zero GX system file
if (strcmp(reinterpret_cast<const char*>(direntry.Filename), "f_zero.dat") != 0) if (strcmp(reinterpret_cast<const char*>(direntry.m_filename), "f_zero.dat") != 0)
return 0; return 0;
// get encrypted destination memory card serial numbers // get encrypted destination memory card serial numbers
@ -1344,10 +1344,10 @@ s32 GCMemcard::PSO_MakeSaveGameValid(const Header& cardheader, const DEntry& dir
u32 pso3offset = 0x00; u32 pso3offset = 0x00;
// check for PSO1&2 system file // check for PSO1&2 system file
if (strcmp(reinterpret_cast<const char*>(direntry.Filename), "PSO_SYSTEM") != 0) if (strcmp(reinterpret_cast<const char*>(direntry.m_filename), "PSO_SYSTEM") != 0)
{ {
// check for PSO3 system file // check for PSO3 system file
if (strcmp(reinterpret_cast<const char*>(direntry.Filename), "PSO3_SYSTEM") == 0) if (strcmp(reinterpret_cast<const char*>(direntry.m_filename), "PSO3_SYSTEM") == 0)
{ {
// PSO3 data block size adjustment // PSO3 data block size adjustment
pso3offset = 0x10; pso3offset = 0x10;

43
Source/Core/Core/HW/GCMemcard/GCMemcard.h
View File

@ -164,15 +164,15 @@ struct DEntry
DEntry() { memset(this, 0xFF, DENTRY_SIZE); } DEntry() { memset(this, 0xFF, DENTRY_SIZE); }
std::string GCI_FileName() const std::string GCI_FileName() const
{ {
std::string filename = std::string((char*)Makercode, 2) + '-' + std::string filename = std::string((char*)m_makercode, 2) + '-' +
std::string((char*)Gamecode, 4) + '-' + (char*)Filename + ".gci"; std::string((char*)m_gamecode, 4) + '-' + (char*)m_filename + ".gci";
return Common::EscapeFileName(filename); return Common::EscapeFileName(filename);
} }
u8 Gamecode[4]; // 0x00 0x04 Gamecode u8 m_gamecode[4]; // 0x00 0x04 Gamecode
u8 Makercode[2]; // 0x04 0x02 Makercode u8 m_makercode[2]; // 0x04 0x02 Makercode
u8 Unused1; // 0x06 0x01 reserved/unused (always 0xff, has no effect) u8 m_unused_1; // 0x06 0x01 reserved/unused (always 0xff, has no effect)
u8 BIFlags; // 0x07 0x01 banner gfx format and icon animation (Image Key) u8 m_banner_and_icon_flags; // 0x07 0x01 banner gfx format and icon animation (Image Key)
// Bit(s) Description // Bit(s) Description
// 2 Icon Animation 0: forward 1: ping-pong // 2 Icon Animation 0: forward 1: ping-pong
// 1 [--0: No Banner 1: Banner present--] WRONG! YAGCD LIES! // 1 [--0: No Banner 1: Banner present--] WRONG! YAGCD LIES!
@ -183,35 +183,36 @@ struct DEntry
// 10 RGB5A3 banner // 10 RGB5A3 banner
// 11 ? maybe ==00? Time Splitters 2 and 3 have it and don't have banner // 11 ? maybe ==00? Time Splitters 2 and 3 have it and don't have banner
// //
u8 Filename[DENTRY_STRLEN]; // 0x08 0x20 Filename u8 m_filename[DENTRY_STRLEN]; // 0x08 0x20 Filename
u8 ModTime[4]; // 0x28 0x04 Time of file's last modification in seconds since 12am, u8 m_modification_time[4]; // 0x28 0x04 Time of file's last modification in seconds since
// January 1st, 2000 // 12am, January 1st, 2000
u8 ImageOffset[4]; // 0x2c 0x04 image data offset u8 m_image_offset[4]; // 0x2c 0x04 image data offset
u8 IconFmt[2]; // 0x30 0x02 icon gfx format (2bits per icon) u8 m_icon_format[2]; // 0x30 0x02 icon gfx format (2bits per icon)
// Bits Description // Bits Description
// 00 No icon // 00 No icon
// 01 CI8 with a shared color palette after the last frame // 01 CI8 with a shared color palette after the last frame
// 10 RGB5A3 // 10 RGB5A3
// 11 CI8 with a unique color palette after itself // 11 CI8 with a unique color palette after itself
// //
u8 AnimSpeed[2]; // 0x32 0x02 Animation speed (2bits per icon) (*1) u8 m_animation_speed[2]; // 0x32 0x02 Animation speed (2bits per icon) (*1)
// Bits Description // Bits Description
// 00 No icon // 00 No icon
// 01 Icon lasts for 4 frames // 01 Icon lasts for 4 frames
// 10 Icon lasts for 8 frames // 10 Icon lasts for 8 frames
// 11 Icon lasts for 12 frames // 11 Icon lasts for 12 frames
// //
u8 Permissions; // 0x34 0x01 File-permissions u8 m_file_permissions; // 0x34 0x01 File-permissions
// Bit Permission Description // Bit Permission Description
// 4 no move File cannot be moved by the IPL // 4 no move File cannot be moved by the IPL
// 3 no copy File cannot be copied by the IPL // 3 no copy File cannot be copied by the IPL
// 2 public Can be read by any game // 2 public Can be read by any game
// //
u8 CopyCounter; // 0x35 0x01 Copy counter (*2) u8 m_copy_counter; // 0x35 0x01 Copy counter (*2)
u8 FirstBlock[2]; // 0x36 0x02 Block no of first block of file (0 == offset 0) u8 m_first_block[2]; // 0x36 0x02 Block no of first block of file (0 == offset 0)
u8 BlockCount[2]; // 0x38 0x02 File-length (number of blocks in file) u8 m_block_count[2]; // 0x38 0x02 File-length (number of blocks in file)
u8 Unused2[2]; // 0x3a 0x02 Reserved/unused (always 0xffff, has no effect) u8 m_unused_2[2]; // 0x3a 0x02 Reserved/unused (always 0xffff, has no effect)
u8 CommentsAddr[4]; // 0x3c 0x04 Address of the two comments within the file data (*3) u8 m_comments_address[4]; // 0x3c 0x04 Address of the two comments within the file data
// (*3)
}; };
static_assert(sizeof(DEntry) == DENTRY_SIZE); static_assert(sizeof(DEntry) == DENTRY_SIZE);
@ -285,9 +286,9 @@ public:
bool LoadSaveBlocks(); bool LoadSaveBlocks();
bool HasCopyProtection() const bool HasCopyProtection() const
{ {
if ((strcmp((char*)m_gci_header.Filename, "PSO_SYSTEM") == 0) || if ((strcmp((char*)m_gci_header.m_filename, "PSO_SYSTEM") == 0) ||
(strcmp((char*)m_gci_header.Filename, "PSO3_SYSTEM") == 0) || (strcmp((char*)m_gci_header.m_filename, "PSO3_SYSTEM") == 0) ||
(strcmp((char*)m_gci_header.Filename, "f_zero.dat") == 0)) (strcmp((char*)m_gci_header.m_filename, "f_zero.dat") == 0))
return true; return true;
return false; return false;
} }

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

@ -58,7 +58,7 @@ int GCMemcardDirectory::LoadGCI(const std::string& file_name, bool current_game_
} }
} }
u16 num_blocks = BE16(gci.m_gci_header.BlockCount); u16 num_blocks = BE16(gci.m_gci_header.m_block_count);
// largest number of free blocks on a memory card // largest number of free blocks on a memory card
// in reality, there are not likely any valid gci files > 251 blocks // in reality, there are not likely any valid gci files > 251 blocks
if (num_blocks > 2043) if (num_blocks > 2043)
@ -79,7 +79,7 @@ int GCMemcardDirectory::LoadGCI(const std::string& file_name, bool current_game_
return NO_INDEX; return NO_INDEX;
} }
if (m_game_id == BE32(gci.m_gci_header.Gamecode)) if (m_game_id == BE32(gci.m_gci_header.m_gamecode))
{ {
gci.LoadSaveBlocks(); gci.LoadSaveBlocks();
} }
@ -108,7 +108,7 @@ int GCMemcardDirectory::LoadGCI(const std::string& file_name, bool current_game_
file_name.c_str()); file_name.c_str());
return NO_INDEX; return NO_INDEX;
} }
*(u16*)&gci.m_gci_header.FirstBlock = first_block; *(u16*)&gci.m_gci_header.m_first_block = first_block;
if (gci.HasCopyProtection() && gci.LoadSaveBlocks()) if (gci.HasCopyProtection() && gci.LoadSaveBlocks())
{ {
GCMemcard::PSO_MakeSaveGameValid(m_hdr, gci.m_gci_header, gci.m_save_data); GCMemcard::PSO_MakeSaveGameValid(m_hdr, gci.m_gci_header, gci.m_save_data);
@ -151,7 +151,7 @@ std::vector<std::string> GCMemcardDirectory::GetFileNamesForGameID(const std::st
if (std::find(loaded_saves.begin(), loaded_saves.end(), gci_filename) != loaded_saves.end()) if (std::find(loaded_saves.begin(), loaded_saves.end(), gci_filename) != loaded_saves.end())
continue; continue;
const u16 num_blocks = BE16(gci.m_gci_header.BlockCount); const u16 num_blocks = BE16(gci.m_gci_header.m_block_count);
// largest number of free blocks on a memory card // largest number of free blocks on a memory card
// in reality, there are not likely any valid gci files > 251 blocks // in reality, there are not likely any valid gci files > 251 blocks
if (num_blocks > 2043) if (num_blocks > 2043)
@ -166,7 +166,7 @@ std::vector<std::string> GCMemcardDirectory::GetFileNamesForGameID(const std::st
// card (see above method), but since we're only loading the saves for one GameID here, we're // card (see above method), but since we're only loading the saves for one GameID here, we're
// definitely not going to run out of space. // definitely not going to run out of space.
if (game_code == BE32(gci.m_gci_header.Gamecode)) if (game_code == BE32(gci.m_gci_header.m_gamecode))
{ {
loaded_saves.push_back(gci_filename); loaded_saves.push_back(gci_filename);
filenames.push_back(file_name); filenames.push_back(file_name);
@ -436,9 +436,9 @@ inline void GCMemcardDirectory::SyncSaves()
for (u32 i = 0; i < DIRLEN; ++i) for (u32 i = 0; i < DIRLEN; ++i)
{ {
if (BE32(current->Dir[i].Gamecode) != 0xFFFFFFFF) if (BE32(current->Dir[i].m_gamecode) != 0xFFFFFFFF)
{ {
INFO_LOG(EXPANSIONINTERFACE, "Syncing save 0x%x", *(u32*)&(current->Dir[i].Gamecode)); INFO_LOG(EXPANSIONINTERFACE, "Syncing save 0x%x", *(u32*)&(current->Dir[i].m_gamecode));
bool added = false; bool added = false;
while (i >= m_saves.size()) while (i >= m_saves.size())
{ {
@ -450,15 +450,15 @@ inline void GCMemcardDirectory::SyncSaves()
if (added || memcmp((u8*)&(m_saves[i].m_gci_header), (u8*)&(current->Dir[i]), DENTRY_SIZE)) if (added || memcmp((u8*)&(m_saves[i].m_gci_header), (u8*)&(current->Dir[i]), DENTRY_SIZE))
{ {
m_saves[i].m_dirty = true; m_saves[i].m_dirty = true;
u32 gamecode = BE32(m_saves[i].m_gci_header.Gamecode); u32 gamecode = BE32(m_saves[i].m_gci_header.m_gamecode);
u32 new_gamecode = BE32(current->Dir[i].Gamecode); u32 new_gamecode = BE32(current->Dir[i].m_gamecode);
u32 old_start = BE16(m_saves[i].m_gci_header.FirstBlock); u32 old_start = BE16(m_saves[i].m_gci_header.m_first_block);
u32 new_start = BE16(current->Dir[i].FirstBlock); u32 new_start = BE16(current->Dir[i].m_first_block);
if ((gamecode != 0xFFFFFFFF) && (gamecode != new_gamecode)) if ((gamecode != 0xFFFFFFFF) && (gamecode != new_gamecode))
{ {
PanicAlertT("Game overwrote with another games save. Data corruption ahead 0x%x, 0x%x", PanicAlertT("Game overwrote with another games save. Data corruption ahead 0x%x, 0x%x",
BE32(m_saves[i].m_gci_header.Gamecode), BE32(current->Dir[i].Gamecode)); BE32(m_saves[i].m_gci_header.m_gamecode), BE32(current->Dir[i].m_gamecode));
} }
memcpy((u8*)&(m_saves[i].m_gci_header), (u8*)&(current->Dir[i]), DENTRY_SIZE); memcpy((u8*)&(m_saves[i].m_gci_header), (u8*)&(current->Dir[i]), DENTRY_SIZE);
if (old_start != new_start) if (old_start != new_start)
@ -476,8 +476,8 @@ inline void GCMemcardDirectory::SyncSaves()
else if ((i < m_saves.size()) && (*(u32*)&(m_saves[i].m_gci_header) != 0xFFFFFFFF)) else if ((i < m_saves.size()) && (*(u32*)&(m_saves[i].m_gci_header) != 0xFFFFFFFF))
{ {
INFO_LOG(EXPANSIONINTERFACE, "Clearing and/or deleting save 0x%x", INFO_LOG(EXPANSIONINTERFACE, "Clearing and/or deleting save 0x%x",
BE32(m_saves[i].m_gci_header.Gamecode)); BE32(m_saves[i].m_gci_header.m_gamecode));
*(u32*)&(m_saves[i].m_gci_header.Gamecode) = 0xFFFFFFFF; *(u32*)&(m_saves[i].m_gci_header.m_gamecode) = 0xFFFFFFFF;
m_saves[i].m_save_data.clear(); m_saves[i].m_save_data.clear();
m_saves[i].m_used_blocks.clear(); m_saves[i].m_used_blocks.clear();
m_saves[i].m_dirty = true; m_saves[i].m_dirty = true;
@ -488,7 +488,7 @@ inline s32 GCMemcardDirectory::SaveAreaRW(u32 block, bool writing)
{ {
for (u16 i = 0; i < m_saves.size(); ++i) for (u16 i = 0; i < m_saves.size(); ++i)
{ {
if (BE32(m_saves[i].m_gci_header.Gamecode) != 0xFFFFFFFF) if (BE32(m_saves[i].m_gci_header.m_gamecode) != 0xFFFFFFFF)
{ {
if (m_saves[i].m_used_blocks.size() == 0) if (m_saves[i].m_used_blocks.size() == 0)
{ {
@ -500,7 +500,7 @@ inline s32 GCMemcardDirectory::SaveAreaRW(u32 block, bool writing)
{ {
if (!m_saves[i].LoadSaveBlocks()) if (!m_saves[i].LoadSaveBlocks())
{ {
int num_blocks = BE16(m_saves[i].m_gci_header.BlockCount); int num_blocks = BE16(m_saves[i].m_gci_header.m_block_count);
while (num_blocks) while (num_blocks)
{ {
m_saves[i].m_save_data.emplace_back(); m_saves[i].m_save_data.emplace_back();
@ -551,7 +551,7 @@ bool GCMemcardDirectory::SetUsedBlocks(int save_index)
else else
current_bat = &m_bat1; current_bat = &m_bat1;
u16 block = BE16(m_saves[save_index].m_gci_header.FirstBlock); u16 block = BE16(m_saves[save_index].m_gci_header.m_first_block);
while (block != 0xFFFF) while (block != 0xFFFF)
{ {
m_saves[save_index].m_used_blocks.push_back(block); m_saves[save_index].m_used_blocks.push_back(block);
@ -563,7 +563,7 @@ bool GCMemcardDirectory::SetUsedBlocks(int save_index)
} }
} }
u16 num_blocks = BE16(m_saves[save_index].m_gci_header.BlockCount); u16 num_blocks = BE16(m_saves[save_index].m_gci_header.m_block_count);
u16 blocks_from_bat = (u16)m_saves[save_index].m_used_blocks.size(); u16 blocks_from_bat = (u16)m_saves[save_index].m_used_blocks.size();
if (blocks_from_bat != num_blocks) if (blocks_from_bat != num_blocks)
{ {
@ -585,7 +585,7 @@ void GCMemcardDirectory::FlushToFile()
{ {
if (m_saves[i].m_dirty) if (m_saves[i].m_dirty)
{ {
if (BE32(m_saves[i].m_gci_header.Gamecode) != 0xFFFFFFFF) if (BE32(m_saves[i].m_gci_header.m_gamecode) != 0xFFFFFFFF)
{ {
m_saves[i].m_dirty = false; m_saves[i].m_dirty = false;
if (m_saves[i].m_save_data.size() == 0) if (m_saves[i].m_save_data.size() == 0)
@ -654,7 +654,7 @@ void GCMemcardDirectory::FlushToFile()
// simultaneously // simultaneously
// this ensures that the save data for all of the current games gci files are stored in the // this ensures that the save data for all of the current games gci files are stored in the
// savestate // savestate
u32 gamecode = BE32(m_saves[i].m_gci_header.Gamecode); u32 gamecode = BE32(m_saves[i].m_gci_header.m_gamecode);
if (gamecode != m_game_id && gamecode != 0xFFFFFFFF && m_saves[i].m_save_data.size()) if (gamecode != m_game_id && gamecode != 0xFFFFFFFF && m_saves[i].m_save_data.size())
{ {
INFO_LOG(EXPANSIONINTERFACE, "Flushing savedata to disk for %s", INFO_LOG(EXPANSIONINTERFACE, "Flushing savedata to disk for %s",
@ -703,7 +703,7 @@ bool GCIFile::LoadSaveBlocks()
INFO_LOG(EXPANSIONINTERFACE, "Reading savedata from disk for %s", m_filename.c_str()); INFO_LOG(EXPANSIONINTERFACE, "Reading savedata from disk for %s", m_filename.c_str());
save_file.Seek(DENTRY_SIZE, SEEK_SET); save_file.Seek(DENTRY_SIZE, SEEK_SET);
u16 num_blocks = BE16(m_gci_header.BlockCount); u16 num_blocks = BE16(m_gci_header.m_block_count);
m_save_data.resize(num_blocks); m_save_data.resize(num_blocks);
if (!save_file.ReadBytes(m_save_data.data(), num_blocks * BLOCK_SIZE)) if (!save_file.ReadBytes(m_save_data.data(), num_blocks * BLOCK_SIZE))
{ {

2
Source/Core/DolphinQt/GCMemcardManager.cpp
View File

@ -202,7 +202,7 @@ void GCMemcardManager::UpdateSlotTable(int slot)
DEntry d; DEntry d;
memcard->GetDEntry(file_index, d); memcard->GetDEntry(file_index, d);
const auto speed = ((d.AnimSpeed[0] & 1) << 2) + (d.AnimSpeed[1] & 1); const auto speed = ((d.m_animation_speed[0] & 1) << 2) + (d.m_animation_speed[1] & 1);
m_slot_active_icons[slot].push_back({speed, frames}); m_slot_active_icons[slot].push_back({speed, frames});