Implement LegoCarBuild::FUN_10024890() and others, refactor (#1126)

* Commit finished code changes

* Add enum data type

* Refactor away GetCurrentArea, SetCurrentArea

* Clean up and add FUN_10024890

* Add `SetPartObjectIdByName()`

* Fix naming error

* Address review comments, part 1

* Address review comments, part 2

---------

Co-authored-by: jonschz <jonschz@users.noreply.github.com>

LEGO1/lego/legoomni/src/actors/bike.cpp

@@ -40,7 +40,7 @@ MxResult Bike::Create(MxDSAction& p_dsAction)
 void Bike::Exit()
 {
 	IslePathActor::Exit();
-	GameState()->SetCurrentArea(LegoGameState::Area::e_bike);
+	GameState()->m_currentArea = LegoGameState::Area::e_bike;
 	RemoveFromCurrentWorld(*g_isleScript, IsleScript::c_BikeDashboard_Bitmap);
 	RemoveFromCurrentWorld(*g_isleScript, IsleScript::c_BikeArms_Ctl);
 	RemoveFromCurrentWorld(*g_isleScript, IsleScript::c_BikeHorn_Ctl);

LEGO1/lego/legoomni/src/actors/helicopter.cpp

@@ -76,7 +76,7 @@ void Helicopter::Exit()
 	IslePathActor::Exit();
 
 	if (GameState()->GetCurrentAct() == LegoGameState::e_act1) {
-		GameState()->SetCurrentArea(LegoGameState::e_copter);
+		GameState()->m_currentArea = LegoGameState::e_copter;
 		if (UserActor() && UserActor()->IsA("IslePathActor")) {
 			((IslePathActor*) UserActor())
 				->SpawnPlayer(
@@ -180,7 +180,7 @@ MxLong Helicopter::HandleControl(LegoControlManagerNotificationParam& p_param)
 				break;
 			}
 			Exit();
-			GameState()->SetCurrentArea(LegoGameState::e_unk66);
+			GameState()->m_currentArea = LegoGameState::e_unk66;
 			ret = 1;
 			break;
 		case IsleScript::c_Helicopter_TakeOff_Ctl: {

LEGO1/lego/legoomni/src/build/legocarbuild.cpp

@@ -1,8 +1,11 @@
 #include "legocarbuild.h"
 
+#include "copter_actions.h"
 #include "dunebuggy.h"
+#include "dunecar_actions.h"
 #include "helicopter.h"
 #include "jetski.h"
+#include "jetski_actions.h"
 #include "jukebox_actions.h"
 #include "legocarbuildpresenter.h"
 #include "legocontrolmanager.h"
@@ -21,11 +24,19 @@
 #include "mxticklemanager.h"
 #include "mxtransitionmanager.h"
 #include "racecar.h"
+#include "racecar_actions.h"
 #include "scripts.h"
 
 #include <isle.h>
 #include <vec.h>
 
+// Names and values verified by BETA10 0x1006d742.
+// Note that these were probably hard-coded numbers in the original.
+#define Helicopter_Actor CopterScript::c_Helicopter_Actor
+#define DuneBugy_Actor DunecarScript::c_DuneBugy_Actor
+#define Jetski_Actor JetskiScript::c_Jetski_Actor
+#define RaceCar_Actor RacecarScript::c_RaceCar_Actor
+
 DECOMP_SIZE_ASSERT(LegoCarBuild, 0x34c)
 DECOMP_SIZE_ASSERT(LegoVehicleBuildState, 0x50)
 
@@ -44,7 +55,7 @@ LegoCarBuild::LegoCarBuild()
 {
 	m_unk0x100 = 0;
 	m_unk0x110 = 0;
-	m_unk0xf8 = 0xffffffff;
+	m_unk0xf8 = c_unknownminusone;
 	m_unk0x2d4 = FALSE;
 	m_unk0x258 = 0;
 	m_ColorBook_Bitmap = NULL;
@@ -87,12 +98,27 @@ MxBool LegoCarBuild::VTable0x5c()
 	return TRUE;
 }
 
-// STUB: LEGO1 0x10022a80
-// STUB: BETA10 0x1006aea3
+// FUNCTION: LEGO1 0x10022a80
+// FUNCTION: BETA10 0x1006aea3
 LegoCarBuild::~LegoCarBuild()
 {
-	// TODO
-	// ...
+	m_unk0x100 = 0;
+	m_unk0x110 = NULL;
+
+	if (m_unk0x258) {
+		m_unk0x258->SetUnknown0xbc(0);
+		m_unk0x258->SetTickleState(MxPresenter::e_idle);
+		m_unk0x258 = NULL;
+	}
+
+	ControlManager()->Unregister(this);
+	TickleManager()->UnregisterClient(this);
+
+	if (InputManager()->GetWorld() == this) {
+		InputManager()->ClearWorld();
+	}
+
+	InputManager()->UnRegister(this);
 	NotificationManager()->Unregister(this);
 }
 
@@ -116,23 +142,23 @@ MxResult LegoCarBuild::Create(MxDSAction& p_dsAction)
 
 		if (m_atomId == *g_copterScript) {
 			buildStateClassName = "LegoCopterBuildState";
-			GameState()->SetCurrentArea(LegoGameState::e_copterbuild);
-			m_unk0x330 = 1;
+			GameState()->m_currentArea = LegoGameState::e_copterbuild;
+			m_carId = Helicopter_Actor;
 		}
 		else if (m_atomId == *g_dunecarScript) {
 			buildStateClassName = "LegoDuneCarBuildState";
-			GameState()->SetCurrentArea(LegoGameState::e_dunecarbuild);
-			m_unk0x330 = 2;
+			GameState()->m_currentArea = LegoGameState::e_dunecarbuild;
+			m_carId = DuneBugy_Actor;
 		}
 		else if (m_atomId == *g_jetskiScript) {
 			buildStateClassName = "LegoJetskiBuildState";
-			GameState()->SetCurrentArea(LegoGameState::e_jetskibuild);
-			m_unk0x330 = 3;
+			GameState()->m_currentArea = LegoGameState::e_jetskibuild;
+			m_carId = Jetski_Actor;
 		}
 		else if (m_atomId == *g_racecarScript) {
 			buildStateClassName = "LegoRaceCarBuildState";
-			GameState()->SetCurrentArea(LegoGameState::e_racecarbuild);
-			m_unk0x330 = 4;
+			GameState()->m_currentArea = LegoGameState::e_racecarbuild;
+			m_carId = Helicopter_Actor;
 		}
 
 		LegoGameState* gameState = GameState();
@@ -409,7 +435,7 @@ MxResult LegoCarBuild::Tickle()
 		return SUCCESS;
 	}
 
-	if (m_unk0xf8 == 8) {
+	if (m_unk0xf8 == c_unknown8) {
 		if (m_unk0xfc == 1) {
 			FUN_10024f50();
 		}
@@ -429,7 +455,7 @@ MxResult LegoCarBuild::Tickle()
 		DWORD time = timeGetTime();
 		DWORD dTime = (time - m_unk0x10c) / 100;
 
-		if (m_unk0x330 == 4) {
+		if (m_carId == Helicopter_Actor) {
 			switch (m_unk0x10a) {
 			// TODO: Work out constants
 			case 500:
@@ -452,7 +478,7 @@ MxResult LegoCarBuild::Tickle()
 				return SUCCESS;
 			}
 		}
-		else if (m_unk0x330 == 3) {
+		else if (m_carId == Jetski_Actor) {
 			switch (m_unk0x10a) {
 			case 500:
 				LEGOCARBUILD_TICKLE_CASE(291, 291, 311, "Exit_Ctl")
@@ -473,7 +499,7 @@ MxResult LegoCarBuild::Tickle()
 				// 	return SUCCESS;
 			}
 		}
-		else if (m_unk0x330 == 2) {
+		else if (m_carId == DuneBugy_Actor) {
 			switch (m_unk0x10a) {
 			case 500:
 				LEGOCARBUILD_TICKLE_CASE(155, 155, 175, "Exit_Ctl")
@@ -490,7 +516,7 @@ MxResult LegoCarBuild::Tickle()
 				return SUCCESS;
 			}
 		}
-		else if (m_unk0x330 == 1) {
+		else if (m_carId == Helicopter_Actor) {
 			switch (m_unk0x10a) {
 			case 500:
 				LEGOCARBUILD_TICKLE_CASE(185, 185, 205, "Exit_Ctl")
@@ -575,7 +601,7 @@ MxLong LegoCarBuild::Notify(MxParam& p_param)
 
 			break;
 		case c_notificationControl:
-			result = FUN_10024890((LegoEventNotificationParam*) &p_param);
+			result = FUN_10024890(&p_param);
 
 			if (result == 1) {
 				m_unk0x109 = 0;
@@ -624,7 +650,7 @@ void LegoCarBuild::ReadyWorld()
 	InitPresenters();
 
 	if (BackgroundAudioManager()->GetEnabled()) {
-		InvokeAction(Extra::ActionType::e_start, *g_jukeboxScript, FUN_10025ee0(m_unk0x330), NULL);
+		InvokeAction(Extra::ActionType::e_start, *g_jukeboxScript, FUN_10025ee0(m_carId), NULL);
 		m_buildState->m_animationState = LegoVehicleBuildState::e_unknown2;
 		NotificationManager()->Send(this, MxNotificationParam());
 	}
@@ -636,8 +662,8 @@ void LegoCarBuild::ReadyWorld()
 // FUNCTION: LEGO1 0x100243a0
 void LegoCarBuild::FUN_100243a0()
 {
-	switch (m_unk0x330) {
-	case 1:
+	switch (m_carId) {
+	case Helicopter_Actor:
 		if (GameState()->GetCurrentAct() == LegoGameState::Act::e_act2) {
 			m_destLocation = LegoGameState::Area::e_act3script;
 			TransitionManager()->StartTransition(MxTransitionManager::TransitionType::e_mosaic, 50, FALSE, FALSE);
@@ -648,15 +674,15 @@ void LegoCarBuild::FUN_100243a0()
 			TransitionManager()->StartTransition(MxTransitionManager::TransitionType::e_mosaic, 50, FALSE, FALSE);
 			break;
 		}
-	case 2:
+	case DuneBugy_Actor:
 		m_destLocation = LegoGameState::Area::e_garadoor;
 		TransitionManager()->StartTransition(MxTransitionManager::TransitionType::e_mosaic, 50, FALSE, FALSE);
 		break;
-	case 3:
+	case Jetski_Actor:
 		m_destLocation = LegoGameState::Area::e_unk17;
 		TransitionManager()->StartTransition(MxTransitionManager::TransitionType::e_mosaic, 50, FALSE, FALSE);
 		break;
-	case 4:
+	case RaceCar_Actor:
 		m_destLocation = LegoGameState::Area::e_unk20;
 		TransitionManager()->StartTransition(MxTransitionManager::TransitionType::e_mosaic, 50, FALSE, FALSE);
 	}
@@ -771,14 +797,207 @@ MxS32 LegoCarBuild::FUN_10024850(MxLong p_x, MxLong p_y)
 	return result;
 }
 
-// STUB: LEGO1 0x10024890
-// STUB: BETA10 0x1006d512
-undefined4 LegoCarBuild::FUN_10024890(LegoEventNotificationParam* p_param)
+#ifdef NDEBUG
+
+// FUNCTION: LEGO1 0x10024890
+undefined4 LegoCarBuild::FUN_10024890(MxParam* p_param)
 {
-	// TODO
-	return 0;
+	undefined4 result = 0;
+	LegoControlManagerNotificationParam* param = (LegoControlManagerNotificationParam*) p_param;
+	assert(m_buildState);
+
+	if (param->m_unk0x28) {
+		switch (param->m_clickedObjectId) {
+		// The enum values are all identical between CopterScript, DunecarScript, JetskiScript, and RacecarScript
+		case CopterScript::c_Info_Ctl:
+			if (m_buildState->m_animationState != LegoVehicleBuildState::e_unknown4 &&
+				m_buildState->m_animationState != LegoVehicleBuildState::e_unknown2 &&
+				m_buildState->m_animationState != LegoVehicleBuildState::e_exiting &&
+				GameState()->GetCurrentAct() != LegoGameState::e_act2) {
+				if (m_unk0x108 > 0) {
+					DeleteObjects(&m_atomId, 500, 510);
+				}
+
+				m_unk0x258->SetUnknown0xbc(0);
+				m_destLocation = LegoGameState::e_infomain;
+				TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, FALSE);
+				result = 1;
+			}
+
+			break;
+		case CopterScript::c_Exit_Ctl:
+			if (m_buildState->m_animationState != LegoVehicleBuildState::e_exiting &&
+				m_buildState->m_animationState != LegoVehicleBuildState::e_unknown4) {
+				if (m_unk0x108 > 0) {
+					DeleteObjects(&m_atomId, 500, 510);
+				}
+
+				m_unk0x258->SetUnknown0xbc(0);
+
+				if (GameState()->GetCurrentAct() == LegoGameState::e_act2) {
+					FUN_100243a0();
+				}
+				else if (m_unk0x258->AllPartsPlaced() || m_buildState->m_unk0x4d) {
+					m_buildState->m_unk0x4d = TRUE;
+					InvokeAction(Extra::e_start, m_atomId, m_carId, NULL);
+
+					NotificationManager()->Send(this, MxNotificationParam());
+
+					m_buildState->m_animationState = LegoVehicleBuildState::e_unknown4;
+				}
+				else {
+					FUN_10025720(4);
+					m_buildState->m_animationState = LegoVehicleBuildState::e_exiting;
+				}
+
+				result = 1;
+			}
+			break;
+		case CopterScript::c_ShelfUp_Ctl:
+			FUN_10024f30();
+			m_Shelf_Sound->Enable(FALSE);
+			m_Shelf_Sound->Enable(TRUE);
+			result = 1;
+			break;
+		case CopterScript::c_Platform_Ctl:
+			FUN_10024f50();
+			m_unk0xf8 = c_unknown8;
+			m_unk0xfc = param->m_unk0x28;
+			result = 1;
+			break;
+		default:
+			if ((m_Decals_Ctl && m_Decals_Ctl->GetAction()->GetObjectId() == param->m_clickedObjectId) ||
+				(m_Decals_Ctl1 && m_Decals_Ctl1->GetAction()->GetObjectId() == param->m_clickedObjectId) ||
+				(m_Decals_Ctl2 && m_Decals_Ctl2->GetAction()->GetObjectId() == param->m_clickedObjectId) ||
+				(m_Decals_Ctl3 && m_Decals_Ctl3->GetAction()->GetObjectId() == param->m_clickedObjectId) ||
+				(m_Decals_Ctl4 && m_Decals_Ctl4->GetAction()->GetObjectId() == param->m_clickedObjectId) ||
+				(m_Decals_Ctl5 && m_Decals_Ctl5->GetAction()->GetObjectId() == param->m_clickedObjectId) ||
+				(m_Decals_Ctl6 && m_Decals_Ctl6->GetAction()->GetObjectId() == param->m_clickedObjectId) ||
+				(m_Decals_Ctl7 && m_Decals_Ctl7->GetAction()->GetObjectId() == param->m_clickedObjectId)) {
+				m_unk0x258->SetPartObjectIdByName(m_unk0x110->GetName(), param->m_clickedObjectId);
+				m_Decal_Sound->Enable(FALSE);
+				m_Decal_Sound->Enable(TRUE);
+			}
+			else {
+				FUN_10025350(param->m_clickedObjectId);
+			}
+
+			result = 1;
+		}
+	}
+	else {
+		m_unk0xf8 = c_unknownminusone;
+		m_unk0xfc = -1;
+	}
+
+	// It is a bit unexpected that LEGO1 and BETA10 match so well with the `return 1`
+	// and ignoring the `result` variable, but the match is hard to argue with
+	return 1;
 }
 
+#else
+
+// FUNCTION: BETA10 0x1006d512
+undefined4 LegoCarBuild::FUN_10024890(MxParam* p_param)
+{
+	undefined4 result = 0;
+	LegoControlManagerNotificationParam* param = (LegoControlManagerNotificationParam*) p_param;
+	assert(m_buildState);
+
+	if (param->m_unk0x28) {
+		switch (param->m_clickedObjectId) {
+		case CopterScript::c_Info_Ctl:
+			m_unk0x258->SetUnknown0xbc(0);
+			m_destLocation = LegoGameState::e_infomain;
+			TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, FALSE);
+			result = 1;
+			break;
+		case CopterScript::c_Exit_Ctl:
+			if (m_buildState->m_animationState != LegoVehicleBuildState::e_exiting) {
+				m_unk0x258->SetUnknown0xbc(0);
+
+				if (m_unk0x258->AllPartsPlaced() || m_buildState->m_unk0x4d) {
+					m_buildState->m_unk0x4d = TRUE;
+
+					// GameState()->GetCurrentAct() returns an MxS16 in BETA10
+					if (GameState()->GetCurrentAct() == 0) {
+						InvokeAction(Extra::e_start, m_atomId, m_carId, NULL);
+
+						NotificationManager()->Send(this, MxNotificationParam());
+
+						assert(m_buildState);
+						m_buildState->m_animationState = LegoVehicleBuildState::e_unknown4;
+					}
+
+					else {
+						FUN_10025720(5);
+						m_buildState->m_animationState = LegoVehicleBuildState::e_exiting;
+					}
+				}
+				else {
+					FUN_10025720(4);
+					m_buildState->m_animationState = LegoVehicleBuildState::e_exiting;
+				}
+
+				switch (GameState()->m_currentArea) {
+				case LegoGameState::e_copterbuild:
+					assert(m_carId == Helicopter_Actor);
+					break;
+				case LegoGameState::e_dunecarbuild:
+					assert(m_carId == DuneBugy_Actor);
+					break;
+				case LegoGameState::e_jetskibuild:
+					assert(m_carId == Jetski_Actor);
+					break;
+				case LegoGameState::e_racecarbuild:
+					assert(m_carId == RaceCar_Actor);
+					break;
+				}
+
+				result = 1;
+			}
+			break;
+		case CopterScript::c_ShelfUp_Ctl:
+			FUN_10024f30();
+			m_Shelf_Sound->Enable(FALSE);
+			m_Shelf_Sound->Enable(TRUE);
+			result = 1;
+			break;
+		case CopterScript::c_Platform_Ctl:
+			FUN_10024f50();
+			m_unk0xf8 = c_unknown8;
+			m_unk0xfc = param->m_unk0x28;
+			result = 1;
+			break;
+		default:
+			if ((m_Decals_Ctl && m_Decals_Ctl->GetAction()->GetObjectId() == param->m_clickedObjectId) ||
+				(m_Decals_Ctl1 && m_Decals_Ctl1->GetAction()->GetObjectId() == param->m_clickedObjectId) ||
+				(m_Decals_Ctl2 && m_Decals_Ctl2->GetAction()->GetObjectId() == param->m_clickedObjectId) ||
+				(m_Decals_Ctl3 && m_Decals_Ctl3->GetAction()->GetObjectId() == param->m_clickedObjectId) ||
+				(m_Decals_Ctl4 && m_Decals_Ctl4->GetAction()->GetObjectId() == param->m_clickedObjectId) ||
+				(m_Decals_Ctl5 && m_Decals_Ctl5->GetAction()->GetObjectId() == param->m_clickedObjectId) ||
+				(m_Decals_Ctl6 && m_Decals_Ctl6->GetAction()->GetObjectId() == param->m_clickedObjectId) ||
+				(m_Decals_Ctl7 && m_Decals_Ctl7->GetAction()->GetObjectId() == param->m_clickedObjectId)) {
+				m_unk0x258->SetPartObjectIdByName(m_unk0x110->GetName(), param->m_clickedObjectId);
+				m_Decal_Sound->Enable(FALSE);
+				m_Decal_Sound->Enable(TRUE);
+			}
+			else {
+				FUN_10025350(param->m_clickedObjectId);
+			}
+			result = 1;
+		}
+	}
+	else {
+		m_unk0xf8 = c_unknownminusone;
+		m_unk0xfc = -1;
+	}
+
+	return 1;
+}
+
+#endif
+
 // FUNCTION: LEGO1 0x10024c20
 // FUNCTION: BETA10 0x1006db21
 undefined4 LegoCarBuild::FUN_10024c20(LegoEventNotificationParam* p_param)
@@ -788,7 +1007,7 @@ undefined4 LegoCarBuild::FUN_10024c20(LegoEventNotificationParam* p_param)
 
 	switch (m_buildState->m_animationState) {
 	case 4:
-		entity = (LegoEntity*) Find(m_atomId, m_unk0x330);
+		entity = (LegoEntity*) Find(m_atomId, m_carId);
 
 		if (entity && entity->GetROI()) {
 
@@ -799,7 +1018,7 @@ undefined4 LegoCarBuild::FUN_10024c20(LegoEventNotificationParam* p_param)
 
 			Act1State* gameState = (Act1State*) GameState()->GetState("Act1State");
 
-			switch (GameState()->GetCurrentArea()) {
+			switch (GameState()->m_currentArea) {
 			case LegoGameState::e_copterbuild:
 				if (gameState->m_helicopter) {
 					delete gameState->m_helicopter;
@@ -837,7 +1056,7 @@ undefined4 LegoCarBuild::FUN_10024c20(LegoEventNotificationParam* p_param)
 			assert(destWorld);
 			m_buildState->m_animationState = LegoVehicleBuildState::e_exiting;
 
-			if (m_unk0x258->m_numberOfParts != m_unk0x258->m_placedPartCount) {
+			if (m_unk0x258->AllPartsPlaced()) {
 				FUN_100243a0();
 			}
 			else {
@@ -852,17 +1071,17 @@ undefined4 LegoCarBuild::FUN_10024c20(LegoEventNotificationParam* p_param)
 	case 2:
 		MxU32 jukeboxScript;
 
-		switch (m_unk0x330) {
-		case 1:
+		switch (m_carId) {
+		case Helicopter_Actor:
 			jukeboxScript = JukeboxScript::c_HelicopterBuild_Music;
 			break;
-		case 2:
+		case DuneBugy_Actor:
 			jukeboxScript = JukeboxScript::c_DuneCarBuild_Music;
 			break;
-		case 3:
+		case Jetski_Actor:
 			jukeboxScript = JukeboxScript::c_JetskiBuild_Music;
 			break;
-		case 4:
+		case RaceCar_Actor:
 			jukeboxScript = JukeboxScript::c_RaceCarBuild_Music;
 		}
 
@@ -893,6 +1112,14 @@ void LegoCarBuild::FUN_10024ef0()
 	FUN_10015820(FALSE, 7);
 }
 
+// FUNCTION: LEGO1 0x10024f30
+// FUNCTION: BETA10 0x1006dfa0
+void LegoCarBuild::FUN_10024f30()
+{
+	FUN_10022f30();
+	m_unk0x258->SetUnknown0xbc(2);
+}
+
 // FUNCTION: LEGO1 0x10024f50
 // FUNCTION: BETA10 0x1006dfce
 void LegoCarBuild::FUN_10024f50()
@@ -973,13 +1200,64 @@ void LegoCarBuild::FUN_100250e0(MxBool p_enabled)
 	}
 }
 
-// STUB: LEGO1 0x10025450
-// STUB: BETA10 0x1006e599
-void LegoCarBuild::FUN_10025450()
+// STUB: LEGO1 0x10025350
+// STUB: BETA10 0x1006e3c0
+void LegoCarBuild::FUN_10025350(MxS32 p_param)
 {
 	// TODO
 }
 
+// FUNCTION: LEGO1 0x10025450
+// FUNCTION: BETA10 0x1006e599
+void LegoCarBuild::FUN_10025450()
+{
+	m_unk0x12c = m_unk0x110->GetLocal2World();
+	m_unk0x1c0 = m_unk0x12c;
+
+	Vector3 lastColumnOfUnk0x1c0(m_unk0x1c0[3]);
+	lastColumnOfUnk0x1c0 = Vector3(m_unk0x258->GetUnknown0xe0()[3]);
+
+	// This looks odd, but it improves the LEGO1 match while breaking the BETA10 match.
+	// I don't know whether this is due to compiler entropy.
+	// Feel free to replace unk0x178 -> m_unk0x178 and remove this variable if it improves the LEGO1 match
+	// in the future.
+	MxMatrix* unk0x178 = &m_unk0x178;
+	*unk0x178 = m_unk0x12c;
+
+	if (m_unk0x258->PartIsPlaced(m_unk0x110->GetName())) {
+		m_unk0x2a4 = Vector4(m_unk0x110->GetWorldPosition());
+
+		if (!m_unk0x2d4) {
+			m_unk0x2bc = m_unk0x2a4;
+
+			m_unk0x208 = m_unk0x12c;
+			m_unk0x2a4[0] += m_unk0x1c0[3][0] - m_unk0x208[3][0];
+			m_unk0x2a4[1] += m_unk0x1c0[3][1] - m_unk0x208[3][1];
+			m_unk0x2a4[2] += m_unk0x1c0[3][2] - m_unk0x208[3][2];
+		}
+
+		*unk0x178 = m_unk0x1c0;
+	}
+	else {
+		const LegoChar* wiredName;
+
+		if (!m_unk0x258->FUN_10079c30(m_unk0x110->GetName())) {
+			wiredName = m_unk0x258->GetWiredNameByPartName(m_unk0x110->GetName());
+		}
+		else {
+			wiredName = m_unk0x258->GetWiredNameOfLastPlacedPart();
+		}
+
+		LegoROI* parentROI = (LegoROI*) m_unk0x110->GetParentROI();
+		m_unk0x208 = parentROI->FindChildROI(wiredName, parentROI)->GetLocal2World();
+		m_unk0x2bc = Vector4(parentROI->FindChildROI(wiredName, parentROI)->GetWorldPosition());
+		m_unk0x2a4 = Vector4(m_unk0x110->GetWorldPosition());
+
+		m_unk0x2a4[2] += (m_unk0x1c0[3][2] - m_unk0x12c[3][2]);
+		m_unk0x178[3][2] = m_unk0x1c0[3][2];
+	}
+}
+
 // FUNCTION: LEGO1 0x100256c0
 // FUNCTION: BETA10 0x1006e96c
 void LegoCarBuild::Enable(MxBool p_enable)
@@ -999,6 +1277,7 @@ void LegoCarBuild::Enable(MxBool p_enable)
 }
 
 // STUB: LEGO1 0x10025720
+// STUB: BETA10 0x1006e9df
 undefined4 LegoCarBuild::FUN_10025720(undefined4 p_param1)
 {
 	// TODO
@@ -1057,7 +1336,7 @@ void LegoCarBuild::FUN_10025e40()
 MxBool LegoCarBuild::Escape()
 {
 	BackgroundAudioManager()->Init();
-	MxS32 targetEntityId = FUN_10025ee0(m_unk0x330);
+	MxS32 targetEntityId = FUN_10025ee0(m_carId);
 	InvokeAction(Extra::ActionType::e_stop, *g_jukeboxScript, targetEntityId, NULL);
 	DeleteObjects(&m_atomId, 500, 999);
 

LEGO1/lego/legoomni/src/build/legocarbuildpresenter.cpp

@@ -627,6 +627,31 @@ MxBool LegoCarBuildAnimPresenter::StringEndsOnZero(const LegoChar* p_string)
 	return (p_string[strlen(p_string) - 2] != '0');
 }
 
+// FUNCTION: LEGO1 0x10079d60
+// FUNCTION: BETA10 0x1007284c
+const LegoChar* LegoCarBuildAnimPresenter::GetWiredNameByPartName(const LegoChar* p_name)
+{
+	for (MxS16 i = 0; i < m_numberOfParts; i++) {
+		if (strcmpi(p_name, m_parts[i].m_name) == 0) {
+			return m_parts[i].m_wiredName;
+		}
+	}
+
+	return NULL;
+}
+
+// FUNCTION: LEGO1 0x10079dc0
+// FUNCTION: BETA10 0x100728d1
+void LegoCarBuildAnimPresenter::SetPartObjectIdByName(const LegoChar* p_name, MxS16 p_objectId)
+{
+	for (MxS16 i = 0; i < m_numberOfParts; i++) {
+		if (strcmpi(p_name, m_parts[i].m_name) == 0) {
+			m_parts[i].m_objectId = p_objectId;
+			return;
+		}
+	}
+}
+
 // FUNCTION: LEGO1 0x10079e20
 // FUNCTION: BETA10 0x10072959
 const BoundingSphere& LegoCarBuildAnimPresenter::FUN_10079e20()

LEGO1/lego/legoomni/src/common/legoutils.cpp

@@ -238,6 +238,7 @@ MxBool CheckIfEntityExists(MxBool p_enable, const char* p_filename, MxS32 p_enti
 void NotifyEntity(const char* p_filename, MxS32 p_entityId, LegoEntity* p_sender);
 
 // FUNCTION: LEGO1 0x1003e430
+// FUNCTION: BETA10 0x100d3fda
 void InvokeAction(Extra::ActionType p_actionId, const MxAtomId& p_pAtom, MxS32 p_targetEntityId, LegoEntity* p_sender)
 {
 	MxDSAction action;

LEGO1/lego/legoomni/src/common/misc.cpp

@@ -188,8 +188,10 @@ void SetCurrentWorld(LegoWorld* p_world)
 }
 
 // FUNCTION: LEGO1 0x10015900
+// FUNCTION: BETA10 0x100e4f02
 MxTransitionManager* TransitionManager()
 {
+	assert(LegoOmni::GetInstance());
 	return LegoOmni::GetInstance()->GetTransitionManager();
 }
 

LEGO1/lego/legoomni/src/common/mxtransitionmanager.cpp

@@ -21,7 +21,7 @@ RECT g_fullScreenRect = {0, 0, 640, 480};
 MxTransitionManager::MxTransitionManager()
 {
 	m_animationTimer = 0;
-	m_transitionType = e_notTransitioning;
+	m_mode = e_idle;
 	m_ddSurface = NULL;
 	m_waitIndicator = NULL;
 	m_copyBuffer = NULL;
@@ -47,20 +47,20 @@ MxTransitionManager::~MxTransitionManager()
 MxResult MxTransitionManager::GetDDrawSurfaceFromVideoManager() // vtable+0x14
 {
 	LegoVideoManager* videoManager = VideoManager();
-	this->m_ddSurface = videoManager->GetDisplaySurface()->GetDirectDrawSurface2();
+	m_ddSurface = videoManager->GetDisplaySurface()->GetDirectDrawSurface2();
 	return SUCCESS;
 }
 
 // FUNCTION: LEGO1 0x1004bac0
 MxResult MxTransitionManager::Tickle()
 {
-	if (this->m_animationSpeed + this->m_systemTime > timeGetTime()) {
+	if (m_animationSpeed + m_systemTime > timeGetTime()) {
 		return SUCCESS;
 	}
 
-	this->m_systemTime = timeGetTime();
+	m_systemTime = timeGetTime();
 
-	switch (this->m_transitionType) {
+	switch (m_mode) {
 	case e_noAnimation:
 		NoTransition();
 		break;
@@ -84,6 +84,7 @@ MxResult MxTransitionManager::Tickle()
 }
 
 // FUNCTION: LEGO1 0x1004bb70
+// FUNCTION: BETA10 0x100ec4c1
 MxResult MxTransitionManager::StartTransition(
 	TransitionType p_animationType,
 	MxS32 p_speed,
@@ -91,13 +92,15 @@ MxResult MxTransitionManager::StartTransition(
 	MxBool p_playMusicInAnim
 )
 {
-	if (this->m_transitionType == e_notTransitioning) {
+	assert(m_mode == e_idle);
+
+	if (m_mode == e_idle) {
 		if (!p_playMusicInAnim) {
 			MxBackgroundAudioManager* backgroundAudioManager = BackgroundAudioManager();
 			backgroundAudioManager->Stop();
 		}
 
-		this->m_transitionType = p_animationType;
+		m_mode = p_animationType;
 
 		m_copyFlags.m_bit0 = p_doCopy;
 
@@ -110,9 +113,9 @@ MxResult MxTransitionManager::StartTransition(
 		}
 
 		MxU32 time = timeGetTime();
-		this->m_systemTime = time;
+		m_systemTime = time;
 
-		this->m_animationSpeed = p_speed;
+		m_animationSpeed = p_speed;
 
 		MxTickleManager* tickleManager = TickleManager();
 		tickleManager->RegisterClient(this, p_speed);
@@ -133,8 +136,8 @@ MxResult MxTransitionManager::StartTransition(
 // FUNCTION: LEGO1 0x1004bc30
 void MxTransitionManager::EndTransition(MxBool p_notifyWorld)
 {
-	if (m_transitionType != e_notTransitioning) {
-		m_transitionType = e_notTransitioning;
+	if (m_mode != e_idle) {
+		m_mode = e_idle;
 
 		m_copyFlags.m_bit0 = FALSE;
 

LEGO1/lego/legoomni/src/control/legocontrolmanager.cpp

@@ -45,6 +45,7 @@ void LegoControlManager::Register(MxCore* p_listener)
 }
 
 // FUNCTION: LEGO1 0x10028ea0
+// FUNCTION: BETA10 0x1007c330
 void LegoControlManager::Unregister(MxCore* p_listener)
 {
 	LegoNotifyListCursor cursor(&m_notifyList);

LEGO1/lego/legoomni/src/input/legoinputmanager.cpp

@@ -339,6 +339,7 @@ void LegoInputManager::SetWorld(LegoWorld* p_world)
 }
 
 // FUNCTION: LEGO1 0x1005c730
+// FUNCTION: BETA10 0x100896dc
 void LegoInputManager::ClearWorld()
 {
 	m_world = NULL;

LEGO1/lego/legoomni/src/video/legovideomanager.cpp

@@ -285,7 +285,7 @@ void LegoVideoManager::ToggleFPS(MxBool p_visible)
 MxResult LegoVideoManager::Tickle()
 {
 	if (m_unk0x554 && !m_videoParam.Flags().GetFlipSurfaces() &&
-		TransitionManager()->GetTransitionType() == MxTransitionManager::e_notTransitioning) {
+		TransitionManager()->GetTransitionType() == MxTransitionManager::e_idle) {
 		Sleep(30);
 	}
 

LEGO1/lego/legoomni/src/worlds/elevatorbottom.cpp

@@ -45,7 +45,7 @@ MxResult ElevatorBottom::Create(MxDSAction& p_dsAction)
 
 	SetIsWorldActive(FALSE);
 
-	GameState()->SetCurrentArea(LegoGameState::e_elevbott);
+	GameState()->m_currentArea = LegoGameState::e_elevbott;
 	GameState()->StopArea(LegoGameState::e_previousArea);
 
 	return result;

LEGO1/lego/legoomni/src/worlds/gasstation.cpp

@@ -91,7 +91,7 @@ MxResult GasStation::Create(MxDSAction& p_dsAction)
 		m_state->m_unk0x14.m_unk0x00 = 3;
 	}
 
-	GameState()->SetCurrentArea(LegoGameState::e_garage);
+	GameState()->m_currentArea = LegoGameState::e_garage;
 	GameState()->StopArea(LegoGameState::e_previousArea);
 
 	InputManager()->Register(this);

LEGO1/lego/legoomni/src/worlds/historybook.cpp

@@ -39,7 +39,7 @@ MxResult HistoryBook::Create(MxDSAction& p_dsAction)
 	InputManager()->SetCamera(NULL);
 	InputManager()->Register(this);
 
-	GameState()->SetCurrentArea(LegoGameState::Area::e_histbook);
+	GameState()->m_currentArea = LegoGameState::Area::e_histbook;
 	GameState()->StopArea(LegoGameState::Area::e_previousArea);
 	return result;
 }

LEGO1/lego/legoomni/src/worlds/hospital.cpp

@@ -96,7 +96,7 @@ MxResult Hospital::Create(MxDSAction& p_dsAction)
 		m_hospitalState->m_unk0x08.m_unk0x00 = 3;
 	}
 
-	GameState()->SetCurrentArea(LegoGameState::e_hospital);
+	GameState()->m_currentArea = LegoGameState::e_hospital;
 	GameState()->StopArea(LegoGameState::e_previousArea);
 
 	InputManager()->Register(this);

LEGO1/lego/legoomni/src/worlds/infocenter.cpp

@@ -210,7 +210,7 @@ MxResult Infocenter::Create(MxDSAction& p_dsAction)
 		}
 	}
 
-	GameState()->SetCurrentArea(LegoGameState::e_infomain);
+	GameState()->m_currentArea = LegoGameState::e_infomain;
 	GameState()->StopArea(LegoGameState::e_previousArea);
 
 	if (m_infocenterState->GetUnknown0x74() == 4) {
@@ -523,9 +523,9 @@ void Infocenter::ReadyWorld()
 			bgRed->Enable(TRUE);
 
 			if (GameState()->GetCurrentAct() == GameState()->GetLoadedAct()) {
-				GameState()->SetCurrentArea(LegoGameState::e_act2main);
+				GameState()->m_currentArea = LegoGameState::e_act2main;
 				GameState()->StopArea(LegoGameState::e_act2main);
-				GameState()->SetCurrentArea(LegoGameState::e_infomain);
+				GameState()->m_currentArea = LegoGameState::e_infomain;
 			}
 
 			m_infocenterState->SetUnknown0x74(5);
@@ -579,9 +579,9 @@ void Infocenter::ReadyWorld()
 			bgRed->Enable(TRUE);
 
 			if (GameState()->GetCurrentAct() == GameState()->GetLoadedAct()) {
-				GameState()->SetCurrentArea(LegoGameState::e_act3script);
+				GameState()->m_currentArea = LegoGameState::e_act3script;
 				GameState()->StopArea(LegoGameState::e_act3script);
-				GameState()->SetCurrentArea(LegoGameState::e_infomain);
+				GameState()->m_currentArea = LegoGameState::e_infomain;
 			}
 
 			m_infocenterState->SetUnknown0x74(5);

LEGO1/lego/legoomni/src/worlds/infocenterdoor.cpp

@@ -48,7 +48,7 @@ MxResult InfocenterDoor::Create(MxDSAction& p_dsAction)
 
 	SetIsWorldActive(FALSE);
 
-	GameState()->SetCurrentArea(LegoGameState::e_infodoor);
+	GameState()->m_currentArea = LegoGameState::e_infodoor;
 	GameState()->StopArea(LegoGameState::e_previousArea);
 
 	return result;

LEGO1/lego/legoomni/src/worlds/isle.cpp

@@ -112,8 +112,8 @@ MxResult Isle::Create(MxDSAction& p_dsAction)
 			m_destLocation = LegoGameState::e_infomain;
 		}
 
-		if (GameState()->GetCurrentArea() == LegoGameState::e_isle) {
-			GameState()->SetCurrentArea(LegoGameState::e_undefined);
+		if (GameState()->m_currentArea == LegoGameState::e_isle) {
+			GameState()->m_currentArea = LegoGameState::e_undefined;
 		}
 
 		LegoGameState* gameState = GameState();

LEGO1/lego/legoomni/src/worlds/jukebox.cpp

@@ -61,7 +61,7 @@ MxResult JukeBox::Create(MxDSAction& p_dsAction)
 		m_state->m_music = JukeBoxState::e_pasquell;
 	}
 
-	GameState()->SetCurrentArea(LegoGameState::e_jukeboxw);
+	GameState()->m_currentArea = LegoGameState::e_jukeboxw;
 	GameState()->StopArea(LegoGameState::e_previousArea);
 	TickleManager()->RegisterClient(this, 2000);
 	return ret;

LEGO1/lego/legoomni/src/worlds/police.cpp

@@ -63,7 +63,7 @@ MxResult Police::Create(MxDSAction& p_dsAction)
 	}
 
 	m_policeState = policeState;
-	GameState()->SetCurrentArea(LegoGameState::e_police);
+	GameState()->m_currentArea = LegoGameState::e_police;
 	GameState()->StopArea(LegoGameState::e_previousArea);
 	return ret;
 }

LEGO1/lego/legoomni/src/worlds/registrationbook.cpp

@@ -97,7 +97,7 @@ MxResult RegistrationBook::Create(MxDSAction& p_dsAction)
 		SetIsWorldActive(FALSE);
 		InputManager()->Register(this);
 
-		GameState()->SetCurrentArea(LegoGameState::e_regbook);
+		GameState()->m_currentArea = LegoGameState::e_regbook;
 		GameState()->StopArea(LegoGameState::e_previousArea);
 
 		m_infocenterState = (InfocenterState*) GameState()->GetState("InfocenterState");

LEGO1/lego/legoomni/src/worlds/score.cpp

@@ -63,7 +63,7 @@ MxResult Score::Create(MxDSAction& p_dsAction)
 		LegoGameState* gameState = GameState();
 		ScoreState* state = (ScoreState*) gameState->GetState("ScoreState");
 		m_state = state ? state : (ScoreState*) gameState->CreateState("ScoreState");
-		GameState()->SetCurrentArea(LegoGameState::e_infoscor);
+		GameState()->m_currentArea = LegoGameState::e_infoscor;
 		GameState()->StopArea(LegoGameState::e_previousArea);
 	}