mirrors/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2025-10-23 08:24:16 +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

28
LEGO1/modeldb/modeldb.cpp
View File

@@ -19,7 +19,7 @@ MxResult ModelDbModel::Read(FILE* p_file)
{
MxU32 len;
if (fread(&len, sizeof(len), 1, p_file) != 1) {
if (fread(&len, sizeof(MxU32), 1, p_file) != 1) {
return FAILURE;
}
@@ -28,13 +28,13 @@ MxResult ModelDbModel::Read(FILE* p_file)
return FAILURE;
}
if (fread(&m_modelDataLength, sizeof(m_modelDataLength), 1, p_file) != 1) {
if (fread(&m_modelDataLength, sizeof(MxU32), 1, p_file) != 1) {
return FAILURE;
}
if (fread(&m_modelDataOffset, sizeof(m_modelDataOffset), 1, p_file) != 1) {
if (fread(&m_modelDataOffset, sizeof(MxU32), 1, p_file) != 1) {
return FAILURE;
}
if (fread(&len, sizeof(len), 1, p_file) != 1) {
if (fread(&len, sizeof(MxU32), 1, p_file) != 1) {
return FAILURE;
}
@@ -43,16 +43,16 @@ MxResult ModelDbModel::Read(FILE* p_file)
return FAILURE;
}
if (fread(&m_location, sizeof(*m_location), 3, p_file) != 3) {
if (fread(&m_location, sizeof(float), 3, p_file) != 3) {
return FAILURE;
}
if (fread(&m_direction, sizeof(*m_direction), 3, p_file) != 3) {
if (fread(&m_direction, sizeof(float), 3, p_file) != 3) {
return FAILURE;
}
if (fread(&m_up, sizeof(*m_up), 3, p_file) != 3) {
if (fread(&m_up, sizeof(float), 3, p_file) != 3) {
return FAILURE;
}
if (fread(&m_unk0x34, sizeof(m_unk0x34), 1, p_file) != 1) {
if (fread(&m_unk0x34, sizeof(undefined), 1, p_file) != 1) {
return FAILURE;
}
@@ -65,7 +65,7 @@ MxResult ModelDbPart::Read(FILE* p_file)
MxU32 len;
char buff[128];
if (fread(&len, sizeof(len), 1, p_file) != 1) {
if (fread(&len, sizeof(MxU32), 1, p_file) != 1) {
return FAILURE;
}
@@ -76,10 +76,10 @@ MxResult ModelDbPart::Read(FILE* p_file)
m_roiName = buff;
if (fread(&m_partDataLength, sizeof(m_partDataLength), 1, p_file) != 1) {
if (fread(&m_partDataLength, sizeof(undefined4), 1, p_file) != 1) {
return FAILURE;
}
if (fread(&m_partDataOffset, sizeof(m_partDataOffset), 1, p_file) != 1) {
if (fread(&m_partDataOffset, sizeof(undefined4), 1, p_file) != 1) {
return FAILURE;
}
@@ -101,7 +101,7 @@ MxResult ReadModelDbWorlds(FILE* p_file, ModelDbWorld*& p_worlds, MxS32& p_numWo
MxS32 worldNameLen, numParts, i, j;
for (i = 0; i < numWorlds; i++) {
if (fread(&worldNameLen, sizeof(worldNameLen), 1, p_file) != 1) {
if (fread(&worldNameLen, sizeof(MxS32), 1, p_file) != 1) {
return FAILURE;
}
@@ -110,7 +110,7 @@ MxResult ReadModelDbWorlds(FILE* p_file, ModelDbWorld*& p_worlds, MxS32& p_numWo
return FAILURE;
}
if (fread(&numParts, sizeof(numParts), 1, p_file) != 1) {
if (fread(&numParts, sizeof(MxS32), 1, p_file) != 1) {
return FAILURE;
}
@@ -126,7 +126,7 @@ MxResult ReadModelDbWorlds(FILE* p_file, ModelDbWorld*& p_worlds, MxS32& p_numWo
worlds[i].m_partList->Append(part);
}
if (fread(&worlds[i].m_numModels, sizeof(worlds[i].m_numModels), 1, p_file) != 1) {
if (fread(&worlds[i].m_numModels, sizeof(MxS32), 1, p_file) != 1) {
return FAILURE;
}