diff --git a/LEGO1/lego/legoomni/include/legoworld.h b/LEGO1/lego/legoomni/include/legoworld.h index 1af6985d..cde4f4b1 100644 --- a/LEGO1/lego/legoomni/include/legoworld.h +++ b/LEGO1/lego/legoomni/include/legoworld.h @@ -73,14 +73,14 @@ class LegoWorld : public LegoEntity { MxS32 p_dest, float p_destScale ); - MxResult AddPathActor(IslePathActor* p_actor); + MxResult AddPathActor(LegoPathActor* p_actor); MxResult FUN_1001fb70( - IslePathActor* p_actor, + LegoPathActor* p_actor, LegoAnimPresenter* p_presenter, Vector3& p_position, Vector3& p_direction ); - void RemovePathActor(IslePathActor* p_actor); + void RemovePathActor(LegoPathActor* p_actor); void FUN_1001fda0(LegoAnimPresenter* p_presenter); void FUN_1001fe90(LegoAnimPresenter* p_presenter); LegoPathBoundary* FindPathBoundary(const char* p_name); diff --git a/LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp b/LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp index 216338b8..912e9d3d 100644 --- a/LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp +++ b/LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp @@ -151,7 +151,7 @@ LegoAnimationManager::~LegoAnimationManager() LegoPathActor* actor = CharacterManager()->GetActor(roi->GetName()); if (actor != NULL && actor->GetController() != NULL && CurrentWorld() != NULL) { - CurrentWorld()->RemovePathActor((IslePathActor*) actor); + CurrentWorld()->RemovePathActor(actor); actor->SetController(NULL); } diff --git a/LEGO1/lego/legoomni/src/entity/legoworld.cpp b/LEGO1/lego/legoomni/src/entity/legoworld.cpp index c0928cd5..0455f1a7 100644 --- a/LEGO1/lego/legoomni/src/entity/legoworld.cpp +++ b/LEGO1/lego/legoomni/src/entity/legoworld.cpp @@ -296,7 +296,7 @@ MxResult LegoWorld::PlaceActor( } // FUNCTION: LEGO1 0x1001fa70 -MxResult LegoWorld::AddPathActor(IslePathActor* p_actor) +MxResult LegoWorld::AddPathActor(LegoPathActor* p_actor) { LegoPathControllerListCursor cursor(&m_list0x68); LegoPathController* controller; @@ -312,7 +312,7 @@ MxResult LegoWorld::AddPathActor(IslePathActor* p_actor) // FUNCTION: LEGO1 0x1001fb70 MxResult LegoWorld::FUN_1001fb70( - IslePathActor* p_actor, + LegoPathActor* p_actor, LegoAnimPresenter* p_presenter, Vector3& p_position, Vector3& p_direction @@ -331,7 +331,7 @@ MxResult LegoWorld::FUN_1001fb70( } // FUNCTION: LEGO1 0x1001fc80 -void LegoWorld::RemovePathActor(IslePathActor* p_actor) +void LegoWorld::RemovePathActor(LegoPathActor* p_actor) { LegoPathControllerListCursor cursor(&m_list0x68); LegoPathController* controller; @@ -503,7 +503,7 @@ void LegoWorld::Remove(MxCore* p_object) } else if (p_object->IsA("MxEntity")) { if (p_object->IsA("LegoPathActor")) { - RemovePathActor((IslePathActor*) p_object); + RemovePathActor((LegoPathActor*) p_object); } if (m_entityList) {