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

Implement/match LegoPathController::AddActor and RemoveActor (#915)

Browse Source 
* Implement/match LegoPathController::AddActor and RemoveActor

* Fix types
This commit is contained in:
Christian Semmler
2024-05-13 06:46:59 -04:00
committed by GitHub
parent 91fe09af3c
commit 5f34d2e877
14 changed files with 145 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -190,7 +190,7 @@ MxU32 Helicopter::VTable0xd4(LegoControlManagerEvent& p_param)
if (m_state->GetUnkown8() == 0) {
state->SetUnknown18(4);
m_state->SetUnknown8(1);
m_world->FUN_1001fc80(this);
m_world->RemovePathActor(this);
InvokeAction(Extra::ActionType::e_start, script, 0x20, NULL);
SetState(0);
}
@@ -203,7 +203,7 @@ MxU32 Helicopter::VTable0xd4(LegoControlManagerEvent& p_param)
}
if (m_state->GetUnkown8() == 2) {
m_state->SetUnknown8(3);
m_world->FUN_1001fc80(this);
m_world->RemovePathActor(this);
InvokeAction(Extra::ActionType::e_start, script, 0x21, NULL);
SetState(4);
}

6
LEGO1/lego/legoomni/src/actors/islepathactor.cpp
View File

@@ -471,7 +471,7 @@ void IslePathActor::SpawnPlayer(LegoGameState::Area p_area, MxBool p_und, MxU8 p
assert(world);
if (m_world != NULL) {
m_world->FUN_1001fc80(this);
m_world->RemovePathActor(this);
m_world->Remove(this);
VideoManager()->Get3DManager()->Remove(*m_roi);
}
@@ -556,7 +556,7 @@ void IslePathActor::SpawnPlayer(LegoGameState::Area p_area, MxBool p_und, MxU8 p
void IslePathActor::VTable0xec(MxMatrix p_transform, LegoPathBoundary* p_boundary, MxBool p_reset)
{
if (m_world) {
m_world->FUN_1001fc80(this);
m_world->RemovePathActor(this);
m_world->Remove(this);
VideoManager()->Get3DManager()->GetLego3DView()->Remove(*m_roi);
}
@@ -566,7 +566,7 @@ void IslePathActor::VTable0xec(MxMatrix p_transform, LegoPathBoundary* p_boundar
VTable0xe0();
}
m_world->FUN_1001fa70(this);
m_world->AddPathActor(this);
p_boundary->AddActor(this);
if (m_actorId != GameState()->GetActorId()) {
m_world->Add(this);