From 7306c453a2baf324527f72b97b694630515ca837 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Sun, 3 Mar 2024 12:54:02 -0500
Subject: [PATCH] Fixes

---
 LEGO1/modeldb/modeldb.cpp | 8 +++-----
 LEGO1/modeldb/modeldb.h   | 4 ++--
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/LEGO1/modeldb/modeldb.cpp b/LEGO1/modeldb/modeldb.cpp
index 894558d3..2c83c588 100644
--- a/LEGO1/modeldb/modeldb.cpp
+++ b/LEGO1/modeldb/modeldb.cpp
@@ -28,26 +28,24 @@ MxResult ReadModelDbWorlds(FILE* p_file, ModelDbWorld*& p_worlds, MxS32& p_numWo
 	}
 
 	ModelDbWorld* worlds = new ModelDbWorld[numWorlds];
+	MxS32 worldNameLen, numParts, i, j;
 
-	for (MxS32 i = 0; i < numWorlds; i++) {
-		MxU32 worldNameLen;
+	for (i = 0; i < numWorlds; i++) {
 		if (fread(&worldNameLen, sizeof(worldNameLen), 1, p_file) != 1) {
 			return FAILURE;
 		}
 
 		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;
 		}
 
-		MxS32 numParts;
 		if (fread(&numParts, sizeof(numParts), 1, p_file) != 1) {
 			return FAILURE;
 		}
 
 		worlds[i].m_partList = new ModelDbPartList();
 
-		MxS32 j;
 		for (j = 0; j < numParts; j++) {
 			ModelDbPart* part = new ModelDbPart();
 
diff --git a/LEGO1/modeldb/modeldb.h b/LEGO1/modeldb/modeldb.h
index dfe68e6c..40f6ecda 100644
--- a/LEGO1/modeldb/modeldb.h
+++ b/LEGO1/modeldb/modeldb.h
@@ -78,8 +78,8 @@ struct ModelDbModel {
 struct ModelDbWorld {
 	char* m_worldName;           // 0x00
 	ModelDbPartList* m_partList; // 0x04
-	MxS32 m_numModels;           // 0x08
-	ModelDbModel* m_models;      // 0x0c
+	ModelDbModel* m_models;      // 0x08
+	MxS32 m_numModels;           // 0x0c
 	undefined m_unk0x10[0x08];   // 0x10
 };