From a6ee94b680344a496bf231eeffce39435b7e7267 Mon Sep 17 00:00:00 2001 From: Fabian Neundorf Date: Fri, 13 Mar 2026 22:47:21 +0100 Subject: [PATCH] Name all referenced areas (#1747) --- LEGO1/lego/legoomni/include/legogamestate.h | 12 ++++++------ LEGO1/lego/legoomni/src/actors/helicopter.cpp | 12 ++++++------ LEGO1/lego/legoomni/src/actors/islepathactor.cpp | 12 ++++++------ LEGO1/lego/legoomni/src/worlds/legoact2.cpp | 2 +- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/LEGO1/lego/legoomni/include/legogamestate.h b/LEGO1/lego/legoomni/include/legogamestate.h index fed3a358..2e150cd4 100644 --- a/LEGO1/lego/legoomni/include/legogamestate.h +++ b/LEGO1/lego/legoomni/include/legogamestate.h @@ -107,21 +107,21 @@ class LegoGameState { e_jetskibuild, e_racecarbuild, e_helicopterSpawn, - e_unk41, - e_unk42, + e_helicopterLanded, + e_helicopterTakenOff, e_dunebuggySpawn, e_racecarSpawn, e_jetskiSpawn, e_act2main, e_act3script, - e_unk48, - e_unk49, - e_unk50, + e_helicopterLandedAct3, + e_helicopterTakenOffAct3, + e_pepperSpawnAct2, e_unk51, e_towTrackHookedUp, e_jukeboxw, e_jukeboxExterior, - e_unk55, + e_helicopterExited, e_histbook, e_bike, e_dunecar, diff --git a/LEGO1/lego/legoomni/src/actors/helicopter.cpp b/LEGO1/lego/legoomni/src/actors/helicopter.cpp index a69430eb..8a547fdf 100644 --- a/LEGO1/lego/legoomni/src/actors/helicopter.cpp +++ b/LEGO1/lego/legoomni/src/actors/helicopter.cpp @@ -95,7 +95,7 @@ void Helicopter::Exit() if (UserActor() && UserActor()->IsA("IslePathActor")) { ((IslePathActor*) UserActor()) ->SpawnPlayer( - LegoGameState::e_unk55, + LegoGameState::e_helicopterExited, TRUE, IslePathActor::c_spawnBit1 | IslePathActor::c_playMusic | IslePathActor::c_spawnBit3 ); @@ -143,7 +143,7 @@ MxLong Helicopter::HandleClick() m_script = *g_isleScript; AnimationManager()->FUN_10064670(NULL); SpawnPlayer( - LegoGameState::e_unk41, + LegoGameState::e_helicopterLanded, TRUE, IslePathActor::c_spawnBit1 | IslePathActor::c_playMusic | IslePathActor::c_spawnBit3 ); @@ -320,14 +320,14 @@ MxLong Helicopter::HandleEndAnim(LegoEndAnimNotificationParam& p_param) assert(act1State); act1State->m_state = Act1State::e_helicopter; SpawnPlayer( - LegoGameState::e_unk42, + LegoGameState::e_helicopterTakenOff, TRUE, IslePathActor::c_spawnBit1 | IslePathActor::c_playMusic | IslePathActor::c_spawnBit3 ); } else { SpawnPlayer( - LegoGameState::e_unk49, + LegoGameState::e_helicopterTakenOffAct3, TRUE, IslePathActor::c_spawnBit1 | IslePathActor::c_playMusic | IslePathActor::c_spawnBit3 ); @@ -361,14 +361,14 @@ MxLong Helicopter::HandleEndAnim(LegoEndAnimNotificationParam& p_param) assert(act1State); act1State->m_state = Act1State::e_none; SpawnPlayer( - LegoGameState::e_unk41, + LegoGameState::e_helicopterLanded, TRUE, IslePathActor::c_spawnBit1 | IslePathActor::c_playMusic | IslePathActor::c_spawnBit3 ); } else { SpawnPlayer( - LegoGameState::e_unk48, + LegoGameState::e_helicopterLandedAct3, TRUE, IslePathActor::c_spawnBit1 | IslePathActor::c_playMusic | IslePathActor::c_spawnBit3 ); diff --git a/LEGO1/lego/legoomni/src/actors/islepathactor.cpp b/LEGO1/lego/legoomni/src/actors/islepathactor.cpp index df7c3634..53349c7b 100644 --- a/LEGO1/lego/legoomni/src/actors/islepathactor.cpp +++ b/LEGO1/lego/legoomni/src/actors/islepathactor.cpp @@ -367,7 +367,7 @@ void IslePathActor::RegisterSpawnLocations() JukeboxScript::c_noneJukebox ); g_spawnLocations[17] = SpawnLocation( - LegoGameState::e_unk41, + LegoGameState::e_helicopterLanded, g_isleScript, 0, "edg02_51", @@ -415,7 +415,7 @@ void IslePathActor::RegisterSpawnLocations() JukeboxScript::c_noneJukebox ); g_spawnLocations[21] = SpawnLocation( - LegoGameState::e_unk42, + LegoGameState::e_helicopterTakenOff, g_isleScript, 0, "inv_05", @@ -427,7 +427,7 @@ void IslePathActor::RegisterSpawnLocations() JukeboxScript::c_noneJukebox ); g_spawnLocations[22] = SpawnLocation( - LegoGameState::e_unk48, + LegoGameState::e_helicopterLandedAct3, g_act3Script, 0, "edg02_51", @@ -439,7 +439,7 @@ void IslePathActor::RegisterSpawnLocations() JukeboxScript::c_noneJukebox ); g_spawnLocations[23] = SpawnLocation( - LegoGameState::e_unk49, + LegoGameState::e_helicopterTakenOffAct3, g_act3Script, 0, "inv_05", @@ -451,7 +451,7 @@ void IslePathActor::RegisterSpawnLocations() JukeboxScript::c_noneJukebox ); g_spawnLocations[24] = SpawnLocation( - LegoGameState::e_unk50, + LegoGameState::e_pepperSpawnAct2, g_act2mainScript, 0, "EDG02_51", @@ -499,7 +499,7 @@ void IslePathActor::RegisterSpawnLocations() JukeboxScript::c_noneJukebox ); g_spawnLocations[28] = SpawnLocation( - LegoGameState::e_unk55, + LegoGameState::e_helicopterExited, g_isleScript, 0, "edg02_50", diff --git a/LEGO1/lego/legoomni/src/worlds/legoact2.cpp b/LEGO1/lego/legoomni/src/worlds/legoact2.cpp index a3ea80e7..46f54b10 100644 --- a/LEGO1/lego/legoomni/src/worlds/legoact2.cpp +++ b/LEGO1/lego/legoomni/src/worlds/legoact2.cpp @@ -488,7 +488,7 @@ void LegoAct2::ReadyWorld() m_pepper = FindROI("pepper"); IslePathActor* pepper = (IslePathActor*) m_pepper->GetEntity(); pepper->SpawnPlayer( - LegoGameState::e_unk50, + LegoGameState::e_pepperSpawnAct2, TRUE, IslePathActor::c_spawnBit1 | IslePathActor::c_playMusic | IslePathActor::c_spawnBit3 );