mirrors/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2025-10-23 00:14:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use sizeof(type) instead of sizeof(variableName) when (de)serializing data (#1505)

Browse Source 
* Use sizeof(type) instead of sizeof(variableName) when (de)serializing data

* Less usage of sizeof(variableName) while (de)serializing
This commit is contained in:
Anonymous Maarten
2025-05-18 22:56:28 +02:00
committed by GitHub
parent c9b41e2db8
commit 2915aa014f
27 changed files with 227 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
LEGO1/omni/src/action/mxdsaction.cpp
View File

@@ -113,14 +113,14 @@ undefined4 MxDSAction::VTable0x14()
MxU32 MxDSAction::GetSizeOnDisk()
{
MxU32 size = MxDSObject::GetSizeOnDisk();
size += sizeof(m_flags);
size += sizeof(m_startTime);
size += sizeof(m_duration);
size += sizeof(m_loopCount);
size += sizeof(MxU32);
size += sizeof(MxS32);
size += sizeof(MxS32);
size += sizeof(MxS32);
size += sizeof(double) * 3; // m_location
size += sizeof(double) * 3; // m_direction
size += sizeof(double) * 3; // m_up
size += sizeof(m_extraLength);
size += sizeof(MxU16);
size += m_extraLength;
m_sizeOnDisk = size - MxDSObject::GetSizeOnDisk();
@@ -261,10 +261,10 @@ void MxDSAction::Deserialize(MxU8*& p_source, MxS16 p_flags)
MxDSObject::Deserialize(p_source, p_flags);
// clang-format off
m_flags = *( MxU32*) p_source; p_source += sizeof(m_flags);
m_startTime = *(MxLong*) p_source; p_source += sizeof(m_startTime);
m_duration = *(MxLong*) p_source; p_source += sizeof(m_duration);
m_loopCount = *( MxS32*) p_source; p_source += sizeof(m_loopCount);
m_flags = *( MxU32*) p_source; p_source += sizeof(MxU32);
m_startTime = *(MxLong*) p_source; p_source += sizeof(MxS32);
m_duration = *(MxLong*) p_source; p_source += sizeof(MxS32);
m_loopCount = *( MxS32*) p_source; p_source += sizeof(MxS32);
m_location[0] = *(double*) p_source; p_source += sizeof(double);
m_location[1] = *(double*) p_source; p_source += sizeof(double);
m_location[2] = *(double*) p_source; p_source += sizeof(double);

24
LEGO1/omni/src/action/mxdsmediaaction.cpp
View File

@@ -116,12 +116,12 @@ MxU32 MxDSMediaAction::GetSizeOnDisk()
totalSizeOnDisk++;
}
totalSizeOnDisk += sizeof(m_unk0x9c.m_unk0x00);
totalSizeOnDisk += sizeof(m_unk0x9c.m_unk0x04);
totalSizeOnDisk += sizeof(m_framesPerSecond);
totalSizeOnDisk += sizeof(m_mediaFormat);
totalSizeOnDisk += sizeof(m_paletteManagement);
totalSizeOnDisk += sizeof(m_sustainTime);
totalSizeOnDisk += sizeof(undefined4);
totalSizeOnDisk += sizeof(undefined4);
totalSizeOnDisk += sizeof(MxS32);
totalSizeOnDisk += sizeof(MxS32);
totalSizeOnDisk += sizeof(MxS32);
totalSizeOnDisk += sizeof(MxS32);
m_sizeOnDisk = totalSizeOnDisk - MxDSAction::GetSizeOnDisk();
return totalSizeOnDisk;
@@ -137,12 +137,12 @@ void MxDSMediaAction::Deserialize(MxU8*& p_source, MxS16 p_flags)
p_source += strlen(m_mediaSrcPath) + 1;
// clang-format off
m_unk0x9c.SetUnk0x00(*(MxU32*) p_source); p_source += sizeof(m_unk0x9c.m_unk0x00);
m_unk0x9c.SetUnk0x04(*(MxU32*) p_source); p_source += sizeof(m_unk0x9c.m_unk0x04);
m_unk0x9c.SetUnk0x00(*(MxU32*) p_source); p_source += sizeof(undefined4);
m_unk0x9c.SetUnk0x04(*(MxU32*) p_source); p_source += sizeof(undefined4);
m_framesPerSecond = *(MxS32*) p_source; p_source += sizeof(m_framesPerSecond);
m_mediaFormat = *(MxS32*) p_source; p_source += sizeof(m_mediaFormat);
m_paletteManagement = *(MxS32*) p_source; p_source += sizeof(m_paletteManagement);
m_sustainTime = *(MxS32*) p_source; p_source += sizeof(m_sustainTime);
m_framesPerSecond = *(MxS32*) p_source; p_source += sizeof(MxS32);
m_mediaFormat = *(MxS32*) p_source; p_source += sizeof(MxS32);
m_paletteManagement = *(MxS32*) p_source; p_source += sizeof(MxS32);
m_sustainTime = *(MxS32*) p_source; p_source += sizeof(MxS32);
// clang-format on
}

8
LEGO1/omni/src/stream/mxstreamchunk.cpp
View File

@@ -38,16 +38,16 @@ MxU32 MxStreamChunk::ReadChunkHeader(MxU8* p_chunkData)
MxU8* chunkData = p_chunkData;
memcpy(&m_flags, p_chunkData, sizeof(m_flags));
p_chunkData += sizeof(m_flags);
p_chunkData += sizeof(MxU16);
memcpy(&m_objectId, p_chunkData, sizeof(m_objectId));
p_chunkData += sizeof(m_objectId);
p_chunkData += sizeof(MxU32);
memcpy(&m_time, p_chunkData, sizeof(m_time));
p_chunkData += sizeof(m_time);
p_chunkData += sizeof(MxU32);
memcpy(&m_length, p_chunkData, sizeof(m_length));
p_chunkData += sizeof(m_length);
p_chunkData += sizeof(MxU32);
m_data = p_chunkData;
headersize = p_chunkData - chunkData;

4
LEGO1/omni/src/video/mxbitmap.cpp
View File

@@ -7,6 +7,8 @@
DECOMP_SIZE_ASSERT(MxBitmap, 0x20);
DECOMP_SIZE_ASSERT(MxBITMAPINFO, 0x428);
DECOMP_SIZE_ASSERT(BITMAPFILEHEADER, 0xe);
// GLOBAL: LEGO1 0x10102184
// GLOBAL: BETA10 0x10203030
MxU16 g_bitmapSignature = TWOCC('B', 'M');
@@ -207,7 +209,7 @@ MxResult MxBitmap::LoadFile(HANDLE p_handle)
MxLong size;
DWORD bytesRead;
BITMAPFILEHEADER hdr;
if (!ReadFile(p_handle, &hdr, sizeof(hdr), &bytesRead, NULL)) {
if (!ReadFile(p_handle, &hdr, 14, &bytesRead, NULL)) {
goto done;
}