This commit is contained in:
Christian Semmler 2024-03-03 12:54:02 -05:00
parent 8b7b826a5b
commit 7306c453a2
2 changed files with 5 additions and 7 deletions

View File

@ -28,26 +28,24 @@ MxResult ReadModelDbWorlds(FILE* p_file, ModelDbWorld*& p_worlds, MxS32& p_numWo
} }
ModelDbWorld* worlds = new ModelDbWorld[numWorlds]; ModelDbWorld* worlds = new ModelDbWorld[numWorlds];
MxS32 worldNameLen, numParts, i, j;
for (MxS32 i = 0; i < numWorlds; i++) { for (i = 0; i < numWorlds; i++) {
MxU32 worldNameLen;
if (fread(&worldNameLen, sizeof(worldNameLen), 1, p_file) != 1) { if (fread(&worldNameLen, sizeof(worldNameLen), 1, p_file) != 1) {
return FAILURE; return FAILURE;
} }
worlds[i].m_worldName = new char[worldNameLen]; worlds[i].m_worldName = new char[worldNameLen];
if (fread(&worlds[i].m_worldName, worldNameLen, 1, p_file) != 1) { if (fread(worlds[i].m_worldName, worldNameLen, 1, p_file) != 1) {
return FAILURE; return FAILURE;
} }
MxS32 numParts;
if (fread(&numParts, sizeof(numParts), 1, p_file) != 1) { if (fread(&numParts, sizeof(numParts), 1, p_file) != 1) {
return FAILURE; return FAILURE;
} }
worlds[i].m_partList = new ModelDbPartList(); worlds[i].m_partList = new ModelDbPartList();
MxS32 j;
for (j = 0; j < numParts; j++) { for (j = 0; j < numParts; j++) {
ModelDbPart* part = new ModelDbPart(); ModelDbPart* part = new ModelDbPart();

View File

@ -78,8 +78,8 @@ struct ModelDbModel {
struct ModelDbWorld { struct ModelDbWorld {
char* m_worldName; // 0x00 char* m_worldName; // 0x00
ModelDbPartList* m_partList; // 0x04 ModelDbPartList* m_partList; // 0x04
MxS32 m_numModels; // 0x08 ModelDbModel* m_models; // 0x08
ModelDbModel* m_models; // 0x0c MxS32 m_numModels; // 0x0c
undefined m_unk0x10[0x08]; // 0x10 undefined m_unk0x10[0x08]; // 0x10
}; };