From d16b3765f0ee7e7a3cd8a7bcef319e0619e5cdab Mon Sep 17 00:00:00 2001 From: Sebastian Mischke Date: Wed, 7 Jan 2026 23:53:35 +0100 Subject: [PATCH] Rename EndingCamera methods --- LEGO1/lego/legoomni/include/helicopter.h | 4 ++-- LEGO1/lego/legoomni/src/actors/helicopter.cpp | 4 ++-- LEGO1/lego/legoomni/src/worlds/act3.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/LEGO1/lego/legoomni/include/helicopter.h b/LEGO1/lego/legoomni/include/helicopter.h index 59ec5407..1e7b860b 100644 --- a/LEGO1/lego/legoomni/include/helicopter.h +++ b/LEGO1/lego/legoomni/include/helicopter.h @@ -76,8 +76,8 @@ class Helicopter : public IslePathActor { void Exit() override; // vtable+0xe4 void CreateState(); - void FUN_10004640(const Matrix4& p_matrix); - void FUN_10004670(const Matrix4& p_matrix); + void StartGoodEndingCamera(const Matrix4& p_matrix); + void StartBadEndingCamera(const Matrix4& p_matrix); // SYNTHETIC: LEGO1 0x10003210 // Helicopter::`scalar deleting destructor' diff --git a/LEGO1/lego/legoomni/src/actors/helicopter.cpp b/LEGO1/lego/legoomni/src/actors/helicopter.cpp index 6847a057..59772499 100644 --- a/LEGO1/lego/legoomni/src/actors/helicopter.cpp +++ b/LEGO1/lego/legoomni/src/actors/helicopter.cpp @@ -489,7 +489,7 @@ void Helicopter::SetupCameraTransition(const Matrix4& p_matrix) } // FUNCTION: LEGO1 0x10004640 -void Helicopter::FUN_10004640(const Matrix4& p_matrix) +void Helicopter::StartGoodEndingCamera(const Matrix4& p_matrix) { if (m_state->m_unk0x08 != 4 && m_state->m_unk0x08 != 5) { m_state->m_unk0x08 = 4; @@ -498,7 +498,7 @@ void Helicopter::FUN_10004640(const Matrix4& p_matrix) } // FUNCTION: LEGO1 0x10004670 -void Helicopter::FUN_10004670(const Matrix4& p_matrix) +void Helicopter::StartBadEndingCamera(const Matrix4& p_matrix) { if (m_state->m_unk0x08 != 4 && m_state->m_unk0x08 != 5) { m_state->m_unk0x08 = 5; diff --git a/LEGO1/lego/legoomni/src/worlds/act3.cpp b/LEGO1/lego/legoomni/src/worlds/act3.cpp index 74c2b383..2cdf2d4c 100644 --- a/LEGO1/lego/legoomni/src/worlds/act3.cpp +++ b/LEGO1/lego/legoomni/src/worlds/act3.cpp @@ -783,7 +783,7 @@ void Act3::GoodEnding(const Matrix4& p_destination) #ifndef BETA10 m_unk0x4220.Clear(); - m_copter->FUN_10004640(p_destination); + m_copter->StartGoodEndingCamera(p_destination); DebugPrintf("In Good Ending..."); DebugCopter( @@ -866,7 +866,7 @@ void Act3::BadEnding(const Matrix4& p_destination) m_brickster->SetActorState(LegoPathActor::c_disabled); m_unk0x4220.Clear(); - m_copter->FUN_10004670(p_destination); + m_copter->StartBadEndingCamera(p_destination); DebugPrintf("In Bad Ending..."); DebugCopter(