Consolidate state and building entity classes (#989)

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

@@ -0,0 +1,28 @@
+#include "act3shark.h"
+
+DECOMP_SIZE_ASSERT(Act3Shark, 0x1a8)
+
+// STUB: LEGO1 0x10042ab0
+Act3Shark::Act3Shark()
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x10042ce0
+MxResult Act3Shark::FUN_10042ce0(void*)
+{
+	// TODO
+	return SUCCESS;
+}
+
+// STUB: LEGO1 0x10042d40
+void Act3Shark::VTable0x70(float p_float)
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x10042f30
+void Act3Shark::ParseAction(char*)
+{
+	// TODO
+}

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

@@ -1,6 +1,5 @@
 #include "ambulance.h"
 
-#include "ambulancemissionstate.h"
 #include "decomp.h"
 #include "legocontrolmanager.h"
 #include "legogamestate.h"
@@ -14,6 +13,7 @@
 #include "scripts.h"
 
 DECOMP_SIZE_ASSERT(Ambulance, 0x184)
+DECOMP_SIZE_ASSERT(AmbulanceMissionState, 0x24)
 
 // FUNCTION: LEGO1 0x10035ee0
 Ambulance::Ambulance()
@@ -152,3 +152,27 @@ void Ambulance::FUN_10037250()
 {
 	// TODO
 }
+
+// FUNCTION: LEGO1 0x100373a0
+AmbulanceMissionState::AmbulanceMissionState()
+{
+	m_unk0x10 = 0;
+	m_unk0x12 = 0;
+	m_unk0x14 = 0;
+	m_unk0x08 = 0;
+	m_unk0x16 = 0;
+	m_unk0x0c = 0;
+	m_unk0x18 = 0;
+	m_score1 = 0;
+	m_score2 = 0;
+	m_score3 = 0;
+	m_score4 = 0;
+	m_score5 = 0;
+}
+
+// STUB: LEGO1 0x10037440
+MxResult AmbulanceMissionState::Serialize(LegoFile* p_legoFile)
+{
+	// TODO
+	return LegoState::Serialize(p_legoFile);
+}

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

@@ -0,0 +1,176 @@
+#include "buildings.h"
+
+#include "act2main_actions.h"
+#include "act3.h"
+#include "act3_actions.h"
+#include "isle.h"
+#include "isle_actions.h"
+#include "islepathactor.h"
+#include "legoact2.h"
+#include "legoanimationmanager.h"
+#include "legogamestate.h"
+#include "legoutils.h"
+#include "legoworld.h"
+#include "misc.h"
+#include "mxtransitionmanager.h"
+#include "scripts.h"
+
+DECOMP_SIZE_ASSERT(BeachHouseEntity, 0x68)
+DECOMP_SIZE_ASSERT(GasStationEntity, 0x68)
+DECOMP_SIZE_ASSERT(HospitalEntity, 0x68)
+DECOMP_SIZE_ASSERT(InfoCenterEntity, 0x68)
+DECOMP_SIZE_ASSERT(JailEntity, 0x68)
+DECOMP_SIZE_ASSERT(PoliceEntity, 0x68)
+DECOMP_SIZE_ASSERT(RaceStandsEntity, 0x68)
+
+// FUNCTION: LEGO1 0x100150c0
+MxLong InfoCenterEntity::VTable0x50(MxParam& p_param)
+{
+	switch (GameState()->GetCurrentAct()) {
+	case LegoGameState::Act::e_act1: {
+		if (CurrentActor()->GetActorId() != GameState()->GetActorId()) {
+			((IslePathActor*) CurrentActor())->VTable0xe4();
+		}
+
+		Isle* isle = (Isle*) FindWorld(*g_isleScript, IsleScript::c__Isle);
+		isle->FUN_10033350();
+		isle->SetDestLocation(LegoGameState::Area::e_infomain);
+
+		Act1State* act1state = (Act1State*) GameState()->GetState("Act1State");
+		act1state->SetUnknown18(0);
+		break;
+	}
+	case LegoGameState::Act::e_act2: {
+		LegoAct2* act2 = (LegoAct2*) FindWorld(*g_act2mainScript, Act2mainScript::c__Act2Main);
+		act2->SetUnknown0x1150(2);
+
+		LegoAct2State* act2state = (LegoAct2State*) GameState()->GetState("LegoAct2State");
+		if (act2state) {
+			act2state->SetUnknown0x0c(0);
+		}
+		break;
+	}
+	case LegoGameState::Act::e_act3:
+		Act3* act3 = (Act3*) FindWorld(*g_act3Script, Act3Script::c__Act3);
+		act3->SetUnknown4270(2);
+		break;
+	}
+
+	AnimationManager()->FUN_10061010(FALSE);
+	TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, FALSE);
+	return 1;
+}
+
+// FUNCTION: LEGO1 0x100151d0
+MxLong GasStationEntity::VTable0x50(MxParam& p_param)
+{
+	if (FUN_1003ef60()) {
+		Act1State* state = (Act1State*) GameState()->GetState("Act1State");
+
+		if (state->GetUnknown18() != 8) {
+			state->SetUnknown18(0);
+
+			if (CurrentActor()->GetActorId() != GameState()->GetActorId()) {
+				((IslePathActor*) CurrentActor())->VTable0xe4();
+			}
+
+			Isle* isle = (Isle*) FindWorld(*g_isleScript, IsleScript::c__Isle);
+			isle->SetDestLocation(LegoGameState::Area::e_garage);
+
+			AnimationManager()->FUN_10061010(FALSE);
+			TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, FALSE);
+		}
+	}
+
+	return 1;
+}
+
+// FUNCTION: LEGO1 0x10015270
+MxLong HospitalEntity::VTable0x50(MxParam& p_param)
+{
+	if (FUN_1003ef60()) {
+		Act1State* act1State = (Act1State*) GameState()->GetState("Act1State");
+
+		if (act1State->GetUnknown18() != 10) {
+			act1State->SetUnknown18(0);
+
+			if (CurrentActor()->GetActorId() != GameState()->GetActorId()) {
+				((IslePathActor*) CurrentActor())->VTable0xe4();
+			}
+
+			Isle* isle = (Isle*) FindWorld(*g_isleScript, IsleScript::c__Isle);
+			isle->SetDestLocation(LegoGameState::Area::e_hospital);
+
+			AnimationManager()->FUN_10061010(FALSE);
+			TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, FALSE);
+		}
+	}
+
+	return 1;
+}
+
+// FUNCTION: LEGO1 0x10015310
+MxLong PoliceEntity::VTable0x50(MxParam& p_param)
+{
+	if (FUN_1003ef60()) {
+		Act1State* state = (Act1State*) GameState()->GetState("Act1State");
+
+		if (state->GetUnknown18() != 10) {
+			state->SetUnknown18(0);
+
+			if (CurrentActor()->GetActorId() != GameState()->GetActorId()) {
+				((IslePathActor*) CurrentActor())->VTable0xe4();
+			}
+
+			Isle* isle = (Isle*) FindWorld(*g_isleScript, IsleScript::c__Isle);
+			isle->SetDestLocation(LegoGameState::Area::e_police);
+
+			AnimationManager()->FUN_10061010(FALSE);
+			TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, FALSE);
+		}
+	}
+
+	return 1;
+}
+
+// FUNCTION: LEGO1 0x100153b0
+MxLong BeachHouseEntity::VTable0x50(MxParam& p_param)
+{
+	if (FUN_1003ef60()) {
+		Act1State* state = (Act1State*) GameState()->GetState("Act1State");
+		state->SetUnknown18(0);
+
+		if (CurrentActor()->GetActorId() != GameState()->GetActorId()) {
+			((IslePathActor*) CurrentActor())->VTable0xe4();
+		}
+
+		Isle* isle = (Isle*) FindWorld(*g_isleScript, IsleScript::c__Isle);
+		isle->SetDestLocation(LegoGameState::Area::e_jetskibuild);
+
+		AnimationManager()->FUN_10061010(FALSE);
+		TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, FALSE);
+	}
+
+	return 1;
+}
+
+// FUNCTION: LEGO1 0x10015450
+MxLong RaceStandsEntity::VTable0x50(MxParam& p_param)
+{
+	if (FUN_1003ef60()) {
+		Act1State* state = (Act1State*) GameState()->GetState("Act1State");
+		state->SetUnknown18(0);
+
+		if (CurrentActor()->GetActorId() != GameState()->GetActorId()) {
+			((IslePathActor*) CurrentActor())->VTable0xe4();
+		}
+
+		Isle* isle = (Isle*) FindWorld(*g_isleScript, IsleScript::c__Isle);
+		isle->SetDestLocation(LegoGameState::Area::e_racecarbuild);
+
+		AnimationManager()->FUN_10061010(FALSE);
+		TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, FALSE);
+	}
+
+	return 1;
+}

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

@@ -1,9 +1,7 @@
 #include "helicopter.h"
 
-#include "act1state.h"
 #include "act3.h"
 #include "act3_actions.h"
-#include "helicopterstate.h"
 #include "isle.h"
 #include "isle_actions.h"
 #include "jukebox.h"
@@ -19,6 +17,7 @@
 #include "scripts.h"
 
 DECOMP_SIZE_ASSERT(Helicopter, 0x230)
+DECOMP_SIZE_ASSERT(HelicopterState, 0x0c)
 DECOMP_SIZE_ASSERT(Mx3DPointFloat, 0x14)
 DECOMP_SIZE_ASSERT(Mx4DPointFloat, 0x18)
 DECOMP_SIZE_ASSERT(MxMatrix, 0x48)

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

@@ -4,10 +4,10 @@
 #include "isle_actions.h"
 #include "jukebox_actions.h"
 #include "legoanimationmanager.h"
+#include "legocarbuild.h"
 #include "legonavcontroller.h"
 #include "legopathboundary.h"
 #include "legoutils.h"
-#include "legovehiclebuildstate.h"
 #include "legovideomanager.h"
 #include "legoworld.h"
 #include "misc.h"

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

@@ -3,8 +3,8 @@
 #include "isle.h"
 #include "isle_actions.h"
 #include "islepathactor.h"
+#include "jukebox.h"
 #include "jukebox_actions.h"
-#include "jukeboxstate.h"
 #include "legogamestate.h"
 #include "legoutils.h"
 #include "misc.h"

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

@@ -1,15 +1,15 @@
 #include "pizza.h"
 
-#include "act1state.h"
 #include "isle_actions.h"
 #include "legogamestate.h"
 #include "legoworld.h"
 #include "misc.h"
 #include "mxmisc.h"
 #include "mxticklemanager.h"
-#include "pizzamissionstate.h"
 
 DECOMP_SIZE_ASSERT(Pizza, 0x9c)
+DECOMP_SIZE_ASSERT(PizzaMissionState, 0xb0)
+DECOMP_SIZE_ASSERT(PizzaMissionState::Entry, 0x20)
 
 // FUNCTION: LEGO1 0x10037ef0
 Pizza::Pizza()
@@ -98,3 +98,22 @@ undefined4 Pizza::HandleEndAction(MxEndActionNotificationParam&)
 	// TODO
 	return 0;
 }
+
+// STUB: LEGO1 0x100393c0
+MxResult PizzaMissionState::Serialize(LegoFile* p_legoFile)
+{
+	// TODO
+	return LegoState::Serialize(p_legoFile);
+}
+
+// FUNCTION: LEGO1 0x10039510
+PizzaMissionState::Entry* PizzaMissionState::GetState(MxU8 p_id)
+{
+	for (MxS16 i = 0; i < 5; i++) {
+		if (m_state[i].m_id == p_id) {
+			return m_state + i;
+		}
+	}
+
+	return NULL;
+}

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

@@ -9,11 +9,11 @@
 #include "legoworld.h"
 #include "misc.h"
 #include "pizza.h"
-#include "pizzamissionstate.h"
-#include "pizzeriastate.h"
 #include "scripts.h"
 
 DECOMP_SIZE_ASSERT(Pizzeria, 0x84)
+DECOMP_SIZE_ASSERT(PizzeriaState, 0x58)
+DECOMP_SIZE_ASSERT(PizzeriaState::StateStruct, 0x14)
 
 // FUNCTION: LEGO1 0x100179c0
 MxResult Pizzeria::Create(MxDSAction& p_dsAction)
@@ -63,3 +63,22 @@ undefined4 Pizzeria::HandleClick()
 
 	return 1;
 }
+
+// STUB: LEGO1 0x10017af0
+PizzeriaState::PizzeriaState()
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x10017d70
+MxU32 PizzeriaState::FUN_10017d70()
+{
+	return 0;
+}
+
+// STUB: LEGO1 0x10017da0
+MxResult PizzeriaState::Serialize(LegoFile* p_legoFile)
+{
+	// TODO
+	return LegoState::Serialize(p_legoFile);
+}

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

@@ -1,6 +1,7 @@
 #include "radio.h"
 
 #include "isle_actions.h"
+#include "jukebox_actions.h"
 #include "legocontrolmanager.h"
 #include "legogamestate.h"
 #include "legoworld.h"
@@ -10,10 +11,52 @@
 #include "mxcontrolpresenter.h"
 #include "mxmisc.h"
 #include "mxnotificationmanager.h"
-#include "radiostate.h"
+#include "mxtimer.h"
 #include "scripts.h"
 
 DECOMP_SIZE_ASSERT(Radio, 0x10)
+DECOMP_SIZE_ASSERT(RadioState, 0x30)
+
+// GLOBAL: LEGO1 0x100f3218
+JukeboxScript::Script g_unk0x100f3218[6] = {
+	JukeboxScript::c_sns002ra_Audio,
+	JukeboxScript::c_sns001ja_Audio,
+	JukeboxScript::c_snsc01js_Audio,
+	JukeboxScript::c_snsb01js_Audio,
+	JukeboxScript::c_snsa01js_Audio,
+	JukeboxScript::c_sns009ra_Audio
+};
+
+// GLOBAL: LEGO1 0x100f3230
+JukeboxScript::Script g_unk0x100f3230[14] = {
+	JukeboxScript::c_ham035ra_Audio,
+	JukeboxScript::c_ham039ra_Audio,
+	JukeboxScript::c_sns005ra_Audio,
+	JukeboxScript::c_sns078pa_Audio,
+	JukeboxScript::c_ham036ra_Audio,
+	JukeboxScript::c_sns006ra_Audio,
+	JukeboxScript::c_sns013ra_Audio,
+	JukeboxScript::c_sns004ra_Audio,
+	JukeboxScript::c_sns079pa_Audio,
+	JukeboxScript::c_sns007ra_Audio,
+	JukeboxScript::c_sns008ra_Audio,
+	JukeboxScript::c_hpz037ma_Audio,
+	JukeboxScript::c_sns003ra_Audio,
+	JukeboxScript::c_sns010ra_Audio,
+};
+
+// GLOBAL: LEGO1 0x100f3268
+JukeboxScript::Script g_unk0x100f3268[9] = {
+	JukeboxScript::c_CentralRoads_Music,
+	JukeboxScript::c_BeachBlvd_Music,
+	JukeboxScript::c_ResidentalArea_Music,
+	JukeboxScript::c_Radio1_Music,
+	JukeboxScript::c_Radio2_Music,
+	JukeboxScript::c_Radio3_Music,
+	JukeboxScript::c_Radio4_Music,
+	JukeboxScript::c_Radio5_Music,
+	JukeboxScript::c_Radio6_Music,
+};
 
 // FUNCTION: LEGO1 0x1002c850
 Radio::Radio()
@@ -162,3 +205,56 @@ void Radio::CreateState()
 
 	m_state = state;
 }
+
+// FUNCTION: LEGO1 0x1002ce10
+RadioState::RadioState()
+{
+	srand(Timer()->GetTime());
+
+	MxS32 random = rand();
+	m_unk0x2c = random % 3;
+
+	m_unk0x08[0] = LegoState::Playlist((MxU32*) g_unk0x100f3218, sizeof(g_unk0x100f3218) / sizeof(g_unk0x100f3218[0]));
+	m_unk0x08[0].SetUnknown0x08(rand() % (sizeof(g_unk0x100f3218) / sizeof(g_unk0x100f3218[0])));
+
+	m_unk0x08[1] = LegoState::Playlist((MxU32*) g_unk0x100f3230, sizeof(g_unk0x100f3230) / sizeof(g_unk0x100f3230[0]));
+	m_unk0x08[1].SetUnknown0x08(rand() % (sizeof(g_unk0x100f3230) / sizeof(g_unk0x100f3230[0])));
+
+	m_unk0x08[2] = LegoState::Playlist((MxU32*) g_unk0x100f3268, sizeof(g_unk0x100f3268) / sizeof(g_unk0x100f3268[0]));
+	m_unk0x08[2].SetUnknown0x08(rand() % (sizeof(g_unk0x100f3268) / sizeof(g_unk0x100f3268[0])));
+
+	m_active = FALSE;
+}
+
+// FUNCTION: LEGO1 0x1002cf50
+MxBool RadioState::IsSerializable()
+{
+	return FALSE;
+}
+
+// FUNCTION: LEGO1 0x1002d090
+MxU32 RadioState::FUN_1002d090()
+{
+	if (m_unk0x2c == 2) {
+		m_unk0x2c = 0;
+	}
+	else {
+		m_unk0x2c++;
+	}
+
+	return m_unk0x08[m_unk0x2c].Next();
+}
+
+// FUNCTION: LEGO1 0x1002d0c0
+MxBool RadioState::FUN_1002d0c0(const MxAtomId& p_atom, MxU32 p_objectId)
+{
+	if (*g_jukeboxScript == p_atom) {
+		for (MxS16 i = 0; i < 3; i++) {
+			if (m_unk0x08[i].Contains(p_objectId)) {
+				return TRUE;
+			}
+		}
+	}
+
+	return FALSE;
+}

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

@@ -1,6 +1,5 @@
 #include "skateboard.h"
 
-#include "act1state.h"
 #include "decomp.h"
 #include "isle.h"
 #include "isle_actions.h"

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

@@ -7,9 +7,9 @@
 #include "mxmisc.h"
 #include "mxtimer.h"
 #include "mxvariabletable.h"
-#include "towtrackmissionstate.h"
 
 DECOMP_SIZE_ASSERT(TowTrack, 0x180)
+DECOMP_SIZE_ASSERT(TowTrackMissionState, 0x28)
 
 // FUNCTION: LEGO1 0x1004c720
 TowTrack::TowTrack()
@@ -131,3 +131,73 @@ void TowTrack::FUN_1004dbe0()
 {
 	// TODO
 }
+
+// FUNCTION: LEGO1 0x1004dd30
+TowTrackMissionState::TowTrackMissionState()
+{
+	m_unk0x12 = 0;
+	m_unk0x14 = 0;
+	m_unk0x16 = 0;
+	m_unk0x08 = 0;
+	m_unk0x18 = 0;
+	m_unk0x0c = 0;
+	m_unk0x1a = 0;
+	m_unk0x10 = 0;
+	m_score1 = 0;
+	m_score2 = 0;
+	m_score3 = 0;
+	m_score4 = 0;
+	m_score5 = 0;
+}
+
+// FUNCTION: LEGO1 0x1004dde0
+MxResult TowTrackMissionState::Serialize(LegoFile* p_legoFile)
+{
+	LegoState::Serialize(p_legoFile);
+
+	if (p_legoFile->IsReadMode()) {
+		p_legoFile->Read(&m_unk0x12, sizeof(m_unk0x12));
+		p_legoFile->Read(&m_unk0x14, sizeof(m_unk0x14));
+		p_legoFile->Read(&m_unk0x16, sizeof(m_unk0x16));
+		p_legoFile->Read(&m_unk0x18, sizeof(m_unk0x18));
+		p_legoFile->Read(&m_unk0x1a, sizeof(m_unk0x1a));
+		p_legoFile->Read(&m_score1, sizeof(m_score1));
+		p_legoFile->Read(&m_score2, sizeof(m_score2));
+		p_legoFile->Read(&m_score3, sizeof(m_score3));
+		p_legoFile->Read(&m_score4, sizeof(m_score4));
+		p_legoFile->Read(&m_score5, sizeof(m_score5));
+	}
+	else if (p_legoFile->IsWriteMode()) {
+		MxU16 write = m_unk0x12;
+		p_legoFile->Write(&write, sizeof(m_unk0x12));
+
+		write = m_unk0x14;
+		p_legoFile->Write(&write, sizeof(m_unk0x12));
+
+		write = m_unk0x16;
+		p_legoFile->Write(&write, sizeof(m_unk0x12));
+
+		write = m_unk0x18;
+		p_legoFile->Write(&write, sizeof(m_unk0x12));
+
+		write = m_unk0x1a;
+		p_legoFile->Write(&write, sizeof(m_unk0x12));
+
+		write = m_score1;
+		p_legoFile->Write(&write, sizeof(m_unk0x12));
+
+		write = m_score2;
+		p_legoFile->Write(&write, sizeof(m_unk0x12));
+
+		write = m_score3;
+		p_legoFile->Write(&write, sizeof(m_unk0x12));
+
+		write = m_score4;
+		p_legoFile->Write(&write, sizeof(m_unk0x12));
+
+		write = m_score5;
+		p_legoFile->Write(&write, sizeof(m_unk0x12));
+	}
+
+	return SUCCESS;
+}