Matches

Author: foxtacles

LEGORacers/include/citrinegrove0x1f4c.h

@@ -20,7 +20,7 @@ class CitrineGrove0x1f4c {
 
 	void FUN_004432d0();
 	void FUN_004432e0(undefined4* p_arg1, undefined4 p_arg2);
-	undefined4 FUN_00443420(undefined4, undefined4);
+	undefined4 FUN_00443420(LegoU32 p_index, undefined4 p_arg2);
 	undefined4 FUN_004434a0(undefined4);
 	void FUN_00443520(undefined4);
 	void FUN_004435c0();

LEGORacers/src/citrinegrove0x1f4c.cpp

@@ -9,6 +9,12 @@
 DECOMP_SIZE_ASSERT(CitrineGrove0x1f4c, 0x1f4c)
 DECOMP_SIZE_ASSERT(MarigoldTrail0x108, 0x108)
 
+// GLOBAL: LEGORACERS 0x004bef80
+const LegoChar* g_defaultSaveFileName = "default.lrs";
+
+// GLOBAL: LEGORACERS 0x004bef84
+const LegoChar* g_quickBuildSaveFileName = "qbuild.lrs";
+
 // FUNCTION: LEGORACERS 0x00443120
 CitrineGrove0x1f4c::CitrineGrove0x1f4c()
 {
@@ -44,42 +50,47 @@ void CitrineGrove0x1f4c::FUN_004432e0(undefined4* p_arg1, undefined4 p_arg2)
 	else {
 		path[0] = '\0';
 	}
+
 	::strcat(path, "Save\\");
 	FUN_00450fc0(path);
 	m_unk0x108.FUN_004426d0(5, 1, 0);
 	m_unk0x18c4.FUN_0042ef80(&m_unk0x108);
 	FUN_00443520(p_arg2);
 	m_unk0x5b0.FUN_004426d0(4, 3, 0);
-	FUN_00443620("default.lrs", &m_unk0x5b0);
+	FUN_00443620(g_defaultSaveFileName, &m_unk0x5b0);
 	m_unk0x1418.FUN_004426d0(36, 3, 0);
-	FUN_00443620("qbuild.lrs", &m_unk0x1418);
+	FUN_00443620(g_quickBuildSaveFileName, &m_unk0x1418);
 	m_unk0x1cfc.FUN_0042b2f0(4, 0, 0, 0);
 }
 
 // FUNCTION: LEGORACERS 0x00443420
-undefined4 CitrineGrove0x1f4c::FUN_00443420(undefined4 p_index, undefined4 p_arg2)
+undefined4 CitrineGrove0x1f4c::FUN_00443420(LegoU32 p_index, undefined4 p_arg2)
 {
-	LegoS32 result = m_unk0xa58[p_index].FUN_00443910();
-	if (result == 0) {
-		result = m_unk0xa58[p_index].FUN_00443980();
-		if (result != 0) {
-			return result;
-		}
-		result = 0;
-	}
-	else if (result == 8) {
-		if (p_arg2 == 0) {
-			return 8;
+	PeridotTrace0x4e0* entry = &m_unk0xa58[p_index];
+	undefined4 status = entry->FUN_00443910();
+
+	if (status == 0) {
+		undefined4 result = entry->FUN_00443980();
+
+		if (result == 0 && m_unk0x18c4.GetUnk0x04() == -1) {
+			m_unk0x18c4.FUN_0042eb60(entry, p_index);
 		}
-		result = m_unk0xa58[p_index].FUN_00443940();
-	}
-	else {
+
 		return result;
 	}
-	if (m_unk0x18c4.GetUnk0x04() == -1) {
-		m_unk0x18c4.FUN_0042eb60(&m_unk0xa58[p_index], p_index);
+	else if (status == 8) {
+		if (p_arg2 != 0) {
+			undefined4 result = entry->FUN_00443940();
+
+			if (m_unk0x18c4.GetUnk0x04() == -1) {
+				m_unk0x18c4.FUN_0042eb60(entry, p_index);
+			}
+
+			return result;
+		}
 	}
-	return result;
+
+	return status;
 }
 
 // FUNCTION: LEGORACERS 0x004434a0
@@ -90,9 +101,11 @@ undefined4 CitrineGrove0x1f4c::FUN_004434a0(undefined4 p_index)
 		m_unk0x18c4.SetUnk0x00(0);
 		return m_unk0xa58[p_index].FUN_004439b0();
 	}
+
 	if (m_unk0xa58[p_index].GetUnk0x20()) {
 		return m_unk0xa58[p_index].FUN_004439b0();
 	}
+
 	return 0;
 }
 
@@ -117,15 +130,18 @@ void CitrineGrove0x1f4c::FUN_00443620(const LegoChar* p_fileName, PeridotTrace0x
 	if (file == NULL) {
 		GOL_FATALERROR(c_golErrorOutOfMemory);
 	}
+
 	if (file->BufferedOpen(p_fileName, GolFile::c_modeRead, 1024)) {
 		if (file != NULL) {
 			delete file;
 		}
 		return;
 	}
+
 	if (p_arg2->FUN_00442770(*file)) {
 		GOL_FATALERROR_MESSAGE("Corrupt install - invalid default save file");
 	}
+
 	file->Dispose();
 	if (file != NULL) {
 		delete file;