Naming / cleanup pass (isledecomp#236)

foxtacles · web-flow · commit 3c7fd51acb89 · 2026-05-11T00:16:12.000+02:00
diff --git a/GolDP/include/bronzefalconsurface0x5c.h b/GolDP/include/bronzefalconsurface0x5c.h
@@ -24,7 +24,7 @@ class BronzeFalconSurface0x5c : public SlatePeak0x58 {
 
 private:
 	void FUN_100136a0(BronzeFalcon0xc8770*);
-	void FUN_100137d0();
+	void ReleaseResources();
 
 	BronzeFalconSurface0x5c* m_next; // 0x58
 };
diff --git a/GolDP/include/zoweeblubberworth0xf0.h b/GolDP/include/zoweeblubberworth0xf0.h
@@ -40,7 +40,7 @@ class ZoweeBlubberworth0xf0 {
 	undefined4 GetUnk0x7c() const { return m_unk0x7c; }
 
 private:
-	void FUN_1002c0e0();
+	void Reset();
 	void FUN_1002c7b0(undefined4*);
 	void FUN_1002c840(undefined4*);
 	void FUN_1002c8d0(undefined4*);
diff --git a/GolDP/src/bronzefalcon0xc8770.cpp b/GolDP/src/bronzefalcon0xc8770.cpp
@@ -552,7 +552,7 @@ void BronzeFalcon0xc8770::ReleaseResources()
 	WhiteFalcon0x140::ReleaseResources();
 
 	for (BronzeFalconSurface0x5c* surface = m_unk0x30c; surface != NULL; surface = surface->m_next) {
-		surface->FUN_100137d0();
+		surface->ReleaseResources();
 	}
 
 	m_unk0x2d4.Destroy();
diff --git a/GolDP/src/bronzefalconsurface0x5c.cpp b/GolDP/src/bronzefalconsurface0x5c.cpp
@@ -29,7 +29,7 @@ void BronzeFalconSurface0x5c::VTable0x14(undefined4*)
 // FUNCTION: GOLDP 0x10013660
 void BronzeFalconSurface0x5c::VTable0x34()
 {
-	FUN_100137d0();
+	ReleaseResources();
 	m_next = NULL;
 	m_drawState = NULL;
 }
@@ -42,7 +42,7 @@ void BronzeFalconSurface0x5c::FUN_100136a0(BronzeFalcon0xc8770*)
 }
 
 // FUNCTION: GOLDP 0x100137d0
-void BronzeFalconSurface0x5c::FUN_100137d0()
+void BronzeFalconSurface0x5c::ReleaseResources()
 {
 	m_palette.Release();
 	if (m_depthBuffer != NULL) {
diff --git a/GolDP/src/duskwindbananarelic0x30.cpp b/GolDP/src/duskwindbananarelic0x30.cpp
@@ -42,13 +42,12 @@ void DuskwindBananaRelic0x30::FUN_10006320(WhiteFalcon0x140& p_renderer)
 			textureCount = 1;
 		}
 
-		LegoU32 bufferSize = textureCount * 16;
-		m_unk0x2c = new LegoU8[bufferSize];
+		m_unk0x2c = new LegoU8[textureCount * 16];
 		if (m_unk0x2c == NULL) {
 			GOL_FATALERROR(c_golErrorOutOfMemory);
 		}
 
-		::memset(m_unk0x2c, 0, bufferSize);
+		::memset(m_unk0x2c, 0, textureCount * 16);
 		if (m_unk0x04 == NULL) {
 			renderer->GetSoftwareRenderer().FUN_100411b0(m_unk0x2c, this, 0);
 			FUN_100064d0(renderer);
diff --git a/GolDP/src/zoweeblubberworth0xf0.cpp b/GolDP/src/zoweeblubberworth0xf0.cpp
@@ -5,11 +5,11 @@ DECOMP_SIZE_ASSERT(ZoweeBlubberworth0xf0, 0xf0)
 // FUNCTION: GOLDP 0x1002c030
 ZoweeBlubberworth0xf0::ZoweeBlubberworth0xf0()
 {
-	FUN_1002c0e0();
+	Reset();
 }
 
 // FUNCTION: GOLDP 0x1002c0e0
-void ZoweeBlubberworth0xf0::FUN_1002c0e0()
+void ZoweeBlubberworth0xf0::Reset()
 {
 	m_unk0x94 = 1.0;
 	m_unk0x04 = 0;
diff --git a/LEGORacers/include/imaginarytool0x368.h b/LEGORacers/include/imaginarytool0x368.h
@@ -133,7 +133,7 @@ class ImaginaryTool0x368 : public ImaginaryNotion0x290 {
 	undefined4 m_unk0x358;             // 0x358
 	ObscureVantage0x58* m_unk0x35c;    // 0x35c
 	LegoU16 m_unk0x360;                // 0x360
-	LegoU16 m_unk0x362;                // 0x362
+	LegoU16 m_menuId;                  // 0x362
 	LegoBool32 m_unk0x364;             // 0x364
 };
 
diff --git a/LEGORacers/src/audio/directmusicgroup.cpp b/LEGORacers/src/audio/directmusicgroup.cpp
@@ -85,14 +85,10 @@ void DirectMusicGroup::Unload()
 		m_musicNames = NULL;
 	}
 
-	while (TRUE) {
-		GolListLink* link = m_musicInstances.LastLink();
-
-		if (!m_musicInstances.IsValidLastLink(link)) {
-			break;
-		}
-
+	GolListLink* link = m_musicInstances.LastLink();
+	while (m_musicInstances.IsValidLastLink(link)) {
 		DestroyMusicInstance(&m_musicInstances.GetItem(*link));
+		link = m_musicInstances.LastLink();
 	}
 
 	m_musicCount = 0;
diff --git a/LEGORacers/src/audio/directsoundmanager.cpp b/LEGORacers/src/audio/directsoundmanager.cpp
@@ -267,9 +267,7 @@ void DirectSoundManager::Pause()
 					sound.StopOrRelease();
 				}
 				else {
-					LegoS32 availableSoundCount = manager->m_availableSoundCount;
-					availableSoundCount++;
-					manager->m_availableSoundCount = availableSoundCount;
+					manager->m_availableSoundCount++;
 					sound.StopDirectSoundBuffer();
 
 					sound.GetLink().Remove();
diff --git a/LEGORacers/src/audio/nullmusicgroup.cpp b/LEGORacers/src/audio/nullmusicgroup.cpp
@@ -39,14 +39,10 @@ void NullMusicGroup::Load(const LegoChar*)
 // FUNCTION: LEGORACERS 0x0041c0d0
 void NullMusicGroup::Unload()
 {
-	while (TRUE) {
-		GolListLink* link = m_musicInstances.LastLink();
-
-		if (!m_musicInstances.IsValidLastLink(link)) {
-			break;
-		}
-
+	GolListLink* link = m_musicInstances.LastLink();
+	while (m_musicInstances.IsValidLastLink(link)) {
 		DestroyMusicInstance(&m_musicInstances.GetItem(*link));
+		link = m_musicInstances.LastLink();
 	}
 
 	m_musicCount = 0;
diff --git a/LEGORacers/src/audio/soundnode.cpp b/LEGORacers/src/audio/soundnode.cpp
@@ -25,8 +25,6 @@ SoundNode::SoundNode()
 	m_orientation.m_y = 1.0f;
 	m_orientation.m_z = 0.0f;
 	m_soundSpeed = g_unk0x4afa38;
-
-	LegoFloat scaledDistance = g_unk0x4afa38;
-	m_maxVelocity = scaledDistance * 0.5f;
+	m_maxVelocity = g_unk0x4afa38 * 0.5f;
 	m_unk0x44 = 1;
 }
diff --git a/LEGORacers/src/imaginaryhammer0x658.cpp b/LEGORacers/src/imaginaryhammer0x658.cpp
@@ -25,7 +25,7 @@ LegoBool32 ImaginaryHammer0x658::VTable0x8c(MenuToolContext0x4bc8* p_context, Me
 {
 	Destroy();
 
-	m_unk0x362 = p_createParams->m_menuId;
+	m_menuId = p_createParams->m_menuId;
 	p_createParams->m_menuId = 1;
 
 	if (!ImaginaryChisel0x658::VTable0x8c(p_context, p_createParams)) {
@@ -35,7 +35,7 @@ LegoBool32 ImaginaryHammer0x658::VTable0x8c(MenuToolContext0x4bc8* p_context, Me
 	undefined4 nextMenu = 0;
 	undefined4 pushExtra = FALSE;
 
-	switch (m_unk0x362) {
+	switch (m_menuId) {
 	case 43:
 		nextMenu = 0x15;
 		break;
@@ -80,7 +80,7 @@ LegoBool32 ImaginaryHammer0x658::Destroy()
 // FUNCTION: LEGORACERS 0x00488550
 void ImaginaryHammer0x658::VTable0x4c()
 {
-	switch (m_unk0x362) {
+	switch (m_menuId) {
 	case 43:
 		if (g_hashTable) {
 			g_hashTable->SetCurrentEntryFromString("MENUDATA\\N64INTR");
@@ -108,7 +108,7 @@ void ImaginaryHammer0x658::VTable0x4c()
 		break;
 	}
 
-	FUN_0046c5b0(&m_unk0x368, m_unk0x362);
+	FUN_0046c5b0(&m_unk0x368, m_menuId);
 }
 
 // FUNCTION: LEGORACERS 0x00488630
@@ -117,7 +117,7 @@ void ImaginaryHammer0x658::VTable0x84()
 	m_unk0x354->m_unk0x04.Pop();
 	m_unk0xc4->SetUnk0x41(TRUE);
 
-	switch (m_unk0x362) {
+	switch (m_menuId) {
 	case 43:
 		m_unk0x354->m_unk0x04.Push(0x29);
 		return;
@@ -142,7 +142,7 @@ void ImaginaryHammer0x658::VTable0x84()
 // FUNCTION: LEGORACERS 0x00488720
 LegoBool32 ImaginaryHammer0x658::VTable0x78(undefined4 p_unk0x04)
 {
-	if (m_unk0x362 != 0x29) {
+	if (m_menuId != 0x29) {
 		m_unk0x368.m_unk0x2cc = 1;
 	}
 
diff --git a/LEGORacers/src/imaginarytool0x368.cpp b/LEGORacers/src/imaginarytool0x368.cpp
@@ -238,7 +238,7 @@ ImaginaryTool0x368::~ImaginaryTool0x368()
 void ImaginaryTool0x368::Reset()
 {
 	m_unk0x360 = 0xffff;
-	m_unk0x362 = 0;
+	m_menuId = 0;
 	m_unk0x354 = NULL;
 	m_unk0x35c = NULL;
 	m_unk0x358 = 0;
diff --git a/LEGORacers/src/racedefinitionlist.cpp b/LEGORacers/src/racedefinitionlist.cpp
@@ -128,9 +128,8 @@ void RaceDefinitionList::Load(GolStringTable* p_stringTable, const LegoChar* p_f
 	parser->OpenFileForRead(p_fileName);
 	parser->AssertNextTokenIs(static_cast<GolFileParser::ParserTokenType>(c_tokenRaceDefinition));
 
-	LegoU32 entryCount = parser->ReadBracketedCountAndLeftCurly();
-	m_entryCount = entryCount;
-	m_entries = new RaceDefinition[entryCount];
+	m_entryCount = parser->ReadBracketedCountAndLeftCurly();
+	m_entries = new RaceDefinition[m_entryCount];
 
 	if (m_entries == NULL) {
 		GOL_FATALERROR(c_golErrorOutOfMemory);
diff --git a/LEGORacers/src/racenamelist.cpp b/LEGORacers/src/racenamelist.cpp
@@ -143,9 +143,8 @@ void RaceNameList::Load(
 	parser->OpenFileForRead(p_fileName);
 	parser->AssertNextTokenIs(static_cast<GolFileParser::ParserTokenType>(c_tokenRaceName));
 
-	LegoU32 entryCount = parser->ReadBracketedCountAndLeftCurly();
-	m_entryCount = entryCount;
-	m_entries = new RaceNameEntry[entryCount];
+	m_entryCount = parser->ReadBracketedCountAndLeftCurly();
+	m_entries = new RaceNameEntry[m_entryCount];
 
 	if (m_entries == NULL) {
 		GOL_FATALERROR(c_golErrorOutOfMemory);
diff --git a/common/src/golstringtable.cpp b/common/src/golstringtable.cpp
@@ -103,13 +103,10 @@ LegoS32 GolStringTable::Load(const LegoChar* p_fileName)
 	LegoU32 stringDataOffset = bytesRead + 2 * sizeof(undefined2);
 	LegoU8* bytes = (LegoU8*) m_stringOffsets;
 
-	i = 0;
-	if (i < m_stringCount) {
-		do {
-			undefined2 word = bytes[0] + (bytes[1] << 8);
-			bytes += sizeof(undefined2);
-			m_stringOffsets[i++] = word;
-		} while (i < m_stringCount);
+	for (i = 0; i < m_stringCount; i++) {
+		undefined2 word = bytes[0] + (bytes[1] << 8);
+		bytes += sizeof(undefined2);
+		m_stringOffsets[i] = word;
 	}
 
 	if (file.BufferedRead(stringDataOffset, m_stringData, sizeof(undefined2) * stringDataLength, &bytesRead)) {
@@ -119,13 +116,10 @@ LegoS32 GolStringTable::Load(const LegoChar* p_fileName)
 	file.Dispose();
 	bytes = (LegoU8*) m_stringData;
 
-	i = 0;
-	if (i < stringDataLength) {
-		do {
-			undefined2 word = bytes[0] + (bytes[1] << 8);
-			bytes += sizeof(undefined2);
-			m_stringData[i++] = word;
-		} while (i < stringDataLength);
+	for (i = 0; i < stringDataLength; i++) {
+		undefined2 word = bytes[0] + (bytes[1] << 8);
+		bytes += sizeof(undefined2);
+		m_stringData[i] = word;
 	}
 
 	return TRUE;

Original file line number	Diff line number	Diff line change
`@@ -552,7 +552,7 @@ void BronzeFalcon0xc8770::ReleaseResources()`
`552`	`552`	`WhiteFalcon0x140::ReleaseResources();`
`553`	`553`
`554`	`554`	`for (BronzeFalconSurface0x5c* surface = m_unk0x30c; surface != NULL; surface = surface->m_next) {`
`555`		`- surface->FUN_100137d0();`
	`555`	`+ surface->ReleaseResources();`
`556`	`556`	`}`
`557`	`557`
`558`	`558`	`m_unk0x2d4.Destroy();`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ void BronzeFalconSurface0x5c::VTable0x14(undefined4*)`
`29`	`29`	`// FUNCTION: GOLDP 0x10013660`
`30`	`30`	`void BronzeFalconSurface0x5c::VTable0x34()`
`31`	`31`	`{`
`32`		`- FUN_100137d0();`
	`32`	`+ ReleaseResources();`
`33`	`33`	`m_next = NULL;`
`34`	`34`	`m_drawState = NULL;`
`35`	`35`	`}`
`@@ -42,7 +42,7 @@ void BronzeFalconSurface0x5c::FUN_100136a0(BronzeFalcon0xc8770*)`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`// FUNCTION: GOLDP 0x100137d0`
`45`		`-void BronzeFalconSurface0x5c::FUN_100137d0()`
	`45`	`+void BronzeFalconSurface0x5c::ReleaseResources()`
`46`	`46`	`{`
`47`	`47`	`m_palette.Release();`
`48`	`48`	`if (m_depthBuffer != NULL) {`
Original file line number	Diff line number	Diff line change
`@@ -42,13 +42,12 @@ void DuskwindBananaRelic0x30::FUN_10006320(WhiteFalcon0x140& p_renderer)`
`42`	`42`	`textureCount = 1;`
`43`	`43`	`}`
`44`	`44`
`45`		`- LegoU32 bufferSize = textureCount * 16;`
`46`		`- m_unk0x2c = new LegoU8[bufferSize];`
	`45`	`+ m_unk0x2c = new LegoU8[textureCount * 16];`
`47`	`46`	`if (m_unk0x2c == NULL) {`
`48`	`47`	`GOL_FATALERROR(c_golErrorOutOfMemory);`
`49`	`48`	`}`
`50`	`49`
`51`		`- ::memset(m_unk0x2c, 0, bufferSize);`
	`50`	`+ ::memset(m_unk0x2c, 0, textureCount * 16);`
`52`	`51`	`if (m_unk0x04 == NULL) {`
`53`	`52`	`renderer->GetSoftwareRenderer().FUN_100411b0(m_unk0x2c, this, 0);`
`54`	`53`	`FUN_100064d0(renderer);`
Original file line number	Diff line number	Diff line change
`@@ -5,11 +5,11 @@ DECOMP_SIZE_ASSERT(ZoweeBlubberworth0xf0, 0xf0)`
`5`	`5`	`// FUNCTION: GOLDP 0x1002c030`
`6`	`6`	`ZoweeBlubberworth0xf0::ZoweeBlubberworth0xf0()`
`7`	`7`	`{`
`8`		`- FUN_1002c0e0();`
	`8`	`+ Reset();`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`// FUNCTION: GOLDP 0x1002c0e0`
`12`		`-void ZoweeBlubberworth0xf0::FUN_1002c0e0()`
	`12`	`+void ZoweeBlubberworth0xf0::Reset()`
`13`	`13`	`{`
`14`	`14`	`m_unk0x94 = 1.0;`
`15`	`15`	`m_unk0x04 = 0;`