From 18c36f8935ed93dd96e5e88582a8f9e51ea48538 Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Thu, 19 Dec 2024 12:10:11 -0700 Subject: [PATCH] Move function --- LEGO1/lego/legoomni/src/worlds/act3.cpp | 46 ++++++++++++------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/LEGO1/lego/legoomni/src/worlds/act3.cpp b/LEGO1/lego/legoomni/src/worlds/act3.cpp index a1ea8ecb..b3bd9337 100644 --- a/LEGO1/lego/legoomni/src/worlds/act3.cpp +++ b/LEGO1/lego/legoomni/src/worlds/act3.cpp @@ -786,29 +786,6 @@ void Act3::GoodEnding(const Matrix4& p_destination) ); } -// FUNCTION: LEGO1 0x100739c0 -// FUNCTION: BETA10 0x10016cc4 -void Act3::BadEnding(const Matrix4& p_destination) -{ - assert(m_cop1 && m_cop2 && m_brickster && m_state); - - m_cop1->SetActorState(LegoPathActor::c_disabled); - m_cop2->SetActorState(LegoPathActor::c_disabled); - m_brickster->SetActorState(LegoPathActor::c_disabled); - - m_unk0x4220.Clear(); - m_copter->FUN_10004670(p_destination); - - DebugPrintf("In Bad Ending..."); - DebugCopter( - m_copter->GetROI()->GetLocal2World(), - p_destination, - m_copter->m_unk0x160, - m_copter->m_unk0x1a8, - m_copter->m_unk0x1f4 - ); -} - // FUNCTION: LEGO1 0x10073500 void Act3::DebugPrintf(const char* p_format, ...) { @@ -867,6 +844,29 @@ void Act3::DebugCopter( } } +// FUNCTION: LEGO1 0x100739c0 +// FUNCTION: BETA10 0x10016cc4 +void Act3::BadEnding(const Matrix4& p_destination) +{ + assert(m_cop1 && m_cop2 && m_brickster && m_state); + + m_cop1->SetActorState(LegoPathActor::c_disabled); + m_cop2->SetActorState(LegoPathActor::c_disabled); + m_brickster->SetActorState(LegoPathActor::c_disabled); + + m_unk0x4220.Clear(); + m_copter->FUN_10004670(p_destination); + + DebugPrintf("In Bad Ending..."); + DebugCopter( + m_copter->GetROI()->GetLocal2World(), + p_destination, + m_copter->m_unk0x160, + m_copter->m_unk0x1a8, + m_copter->m_unk0x1f4 + ); +} + // FUNCTION: LEGO1 0x10073a60 void Act3::FUN_10073a60() {