mirrors/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2025-10-23 00:14:22 +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

64
LEGO1/lego/legoomni/src/entity/legoworld.cpp
View File

@@ -295,33 +295,49 @@ MxResult LegoWorld::PlaceActor(
return FAILURE;
}
// STUB: LEGO1 0x1001fa70
undefined4 LegoWorld::FUN_1001fa70(IslePathActor* p_actor)
{
// TODO
return 0;
}
// STUB: LEGO1 0x1001fb70
undefined4 LegoWorld::FUN_1001fb70(
IslePathActor* p_actor,
LegoAnimPresenter* p_presenter,
Vector3& p_position,
Vector3& p_direction
)
{
// TODO
return 0;
}
// FUNCTION: LEGO1 0x1001fc80
void LegoWorld::FUN_1001fc80(IslePathActor* p_actor)
// FUNCTION: LEGO1 0x1001fa70
MxResult LegoWorld::AddPathActor(LegoPathActor* p_actor)
{
LegoPathControllerListCursor cursor(&m_list0x68);
LegoPathController* controller;
while (cursor.Next(controller)) {
if (!controller->FUN_10046770(p_actor)) {
if (controller->AddActor(p_actor) == SUCCESS) {
return SUCCESS;
}
}
return FAILURE;
}
// FUNCTION: LEGO1 0x1001fb70
MxResult LegoWorld::FUN_1001fb70(
LegoPathActor* p_actor,
LegoAnimPresenter* p_presenter,
Vector3& p_position,
Vector3& p_direction
)
{
LegoPathControllerListCursor cursor(&m_list0x68);
LegoPathController* controller;
while (cursor.Next(controller)) {
if (controller->FUN_10046050(p_actor, p_presenter, p_position, p_direction) == SUCCESS) {
return SUCCESS;
}
}
return FAILURE;
}
// FUNCTION: LEGO1 0x1001fc80
void LegoWorld::RemovePathActor(LegoPathActor* p_actor)
{
LegoPathControllerListCursor cursor(&m_list0x68);
LegoPathController* controller;
while (cursor.Next(controller)) {
if (controller->RemoveActor(p_actor) == SUCCESS) {
break;
}
}
@@ -487,7 +503,7 @@ void LegoWorld::Remove(MxCore* p_object)
}
else if (p_object->IsA("MxEntity")) {
if (p_object->IsA("LegoPathActor")) {
FUN_1001fc80((IslePathActor*) p_object);
RemovePathActor((LegoPathActor*) p_object);
}
if (m_entityList) {
@@ -688,7 +704,7 @@ void LegoWorld::Enable(MxBool p_enable)
IslePathActor* actor = CurrentActor();
if (actor) {
FUN_1001fc80(actor);
RemovePathActor(actor);
}
AnimationManager()->Reset(FALSE);