mirrors/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2025-10-27 18:34:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implement LegoAct2::Tickle() and others (#1168)

Browse Source 
* Implement `LegoAct2::Tickle()` and others

* Fix decomplint errors

* Minor cleanup

* Address review comments

---------

Co-authored-by: jonschz <jonschz@users.noreply.github.com>
This commit is contained in:
jonschz
2024-11-25 23:24:46 +01:00
committed by GitHub
parent b9a1da6a7a
commit 83b85f26a7
14 changed files with 221 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
LEGO1/lego/legoomni/src/actors/act2actor.cpp
View File

@@ -67,6 +67,13 @@ void Act2Actor::SetWorldSpeed(MxFloat p_worldSpeed)
m_unk0x44 = 0;
}
// STUB: LEGO1 0x10019520
// STUB: BETA10 0x1000d4d6
void Act2Actor::FUN_10019520()
{
// TODO
}
// STUB: LEGO1 0x100195a0
MxS32 Act2Actor::VTable0xa0()
{

4
LEGO1/lego/legoomni/src/actors/helicopter.cpp
View File

@@ -133,7 +133,7 @@ MxLong Helicopter::HandleClick()
((Isle*) CurrentWorld())->SetDestLocation(LegoGameState::e_copter);
FUN_10015820(TRUE, 0);
TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, TRUE);
SetState(4);
SetState(LegoPathActor::c_bit3);
PlayMusic(JukeboxScript::c_Jail_Music);
break;
case LegoGameState::e_act2:
@@ -206,7 +206,7 @@ MxLong Helicopter::HandleControl(LegoControlManagerNotificationParam& p_param)
m_state->SetUnknown8(3);
m_world->RemoveActor(this);
InvokeAction(Extra::ActionType::e_start, script, IsleScript::c_HelicopterLand_Anim, NULL);
SetState(4);
SetState(LegoPathActor::c_bit3);
}
ret = 1;
break;