diff options
| author | Admiral H. Curtiss <pikachu025@gmail.com> | 2018-11-18 17:28:28 +0100 |
|---|---|---|
| committer | Admiral H. Curtiss <pikachu025@gmail.com> | 2018-12-09 22:28:56 +0100 |
| commit | 65f6250faa8bfa3fa47b361307cbdfbc42baa343 (patch) | |
| tree | baef19f848a2980d7e31249e0de7159a9be66659 /Source | |
| parent | 1d25e249e84f62fabf5d84e646a51857168de5b9 (diff) | |
GCMemcard: Use BigEndianValue for DEntry.m_image_offset.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/Core/HW/GCMemcard/GCMemcard.cpp | 15 | ||||
| -rw-r--r-- | Source/Core/Core/HW/GCMemcard/GCMemcard.h | 4 |
2 files changed, 12 insertions, 7 deletions
diff --git a/Source/Core/Core/HW/GCMemcard/GCMemcard.cpp b/Source/Core/Core/HW/GCMemcard/GCMemcard.cpp index 9dc7012927..8868cd40eb 100644 --- a/Source/Core/Core/HW/GCMemcard/GCMemcard.cpp +++ b/Source/Core/Core/HW/GCMemcard/GCMemcard.cpp @@ -444,7 +444,7 @@ u32 GCMemcard::DEntry_ImageOffset(u8 index) const if (!m_valid || index >= DIRLEN) return 0xFFFFFFFF; - return BE32(CurrentDir->m_dir_entries[index].m_image_offset); + return CurrentDir->m_dir_entries[index].m_image_offset; } std::string GCMemcard::DEntry_IconFmt(u8 index) const @@ -1040,8 +1040,13 @@ void GCMemcard::Gcs_SavConvert(DEntry& tempDEntry, int saveType, int length) // 0x3C and 0x3D,0x3E and 0x3F. // It seems that sav files also swap the banner/icon flags... ByteSwap(&tempDEntry.m_unused_1, &tempDEntry.m_banner_and_icon_flags); - ArrayByteSwap((tempDEntry.m_image_offset)); - ArrayByteSwap(&(tempDEntry.m_image_offset[2])); + + std::array<u8, 4> tmp; + memcpy(tmp.data(), &tempDEntry.m_image_offset, 4); + ByteSwap(&tmp[0], &tmp[1]); + ByteSwap(&tmp[2], &tmp[3]); + memcpy(&tempDEntry.m_image_offset, tmp.data(), 4); + ArrayByteSwap((tempDEntry.m_icon_format)); ArrayByteSwap((tempDEntry.m_animation_speed)); ByteSwap(&tempDEntry.m_file_permissions, &tempDEntry.m_copy_counter); @@ -1072,7 +1077,7 @@ bool GCMemcard::ReadBannerRGBA8(u8 index, u32* buffer) const if (bnrFormat == 0) return false; - u32 DataOffset = BE32(CurrentDir->m_dir_entries[index].m_image_offset); + u32 DataOffset = CurrentDir->m_dir_entries[index].m_image_offset; u32 DataBlock = BE16(CurrentDir->m_dir_entries[index].m_first_block) - MC_FST_BLOCKS; if ((DataBlock > maxBlock) || (DataOffset == 0xFFFFFFFF)) @@ -1119,7 +1124,7 @@ u32 GCMemcard::ReadAnimRGBA8(u8 index, u32* buffer, u8* delays) const int bnrFormat = (flags & 3); - u32 DataOffset = BE32(CurrentDir->m_dir_entries[index].m_image_offset); + u32 DataOffset = CurrentDir->m_dir_entries[index].m_image_offset; u32 DataBlock = BE16(CurrentDir->m_dir_entries[index].m_first_block) - MC_FST_BLOCKS; if ((DataBlock > maxBlock) || (DataOffset == 0xFFFFFFFF)) diff --git a/Source/Core/Core/HW/GCMemcard/GCMemcard.h b/Source/Core/Core/HW/GCMemcard/GCMemcard.h index 03d31ee322..f4a9c8826a 100644 --- a/Source/Core/Core/HW/GCMemcard/GCMemcard.h +++ b/Source/Core/Core/HW/GCMemcard/GCMemcard.h @@ -190,8 +190,8 @@ struct DEntry Common::BigEndianValue<u32> m_modification_time; // 0x28 0x04 Time of file's last modification in seconds since // 12am, January 1st, 2000 - u8 m_image_offset[4]; // 0x2c 0x04 image data offset - u8 m_icon_format[2]; // 0x30 0x02 icon gfx format (2bits per icon) + Common::BigEndianValue<u32> m_image_offset; // 0x2c 0x04 image data offset + u8 m_icon_format[2]; // 0x30 0x02 icon gfx format (2bits per icon) // Bits Description // 00 No icon // 01 CI8 with a shared color palette after the last frame |