isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2026-01-24 08:41:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix types

Browse Source
This commit is contained in:
Christian Semmler 2024-05-13 06:40:45 -04:00
parent 191e9db7b3
commit eed99fadee
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
LEGO1/lego/legoomni/include/legoworld.h
View File

@ -73,14 +73,14 @@ class LegoWorld : public LegoEntity {
MxS32 p_dest, MxS32 p_dest,
float p_destScale float p_destScale
); );
MxResult AddPathActor(IslePathActor* p_actor); MxResult AddPathActor(LegoPathActor* p_actor);
MxResult FUN_1001fb70( MxResult FUN_1001fb70(
IslePathActor* p_actor, LegoPathActor* p_actor,
LegoAnimPresenter* p_presenter, LegoAnimPresenter* p_presenter,
Vector3& p_position, Vector3& p_position,
Vector3& p_direction Vector3& p_direction
); );
void RemovePathActor(IslePathActor* p_actor); void RemovePathActor(LegoPathActor* p_actor);
void FUN_1001fda0(LegoAnimPresenter* p_presenter); void FUN_1001fda0(LegoAnimPresenter* p_presenter);
void FUN_1001fe90(LegoAnimPresenter* p_presenter); void FUN_1001fe90(LegoAnimPresenter* p_presenter);
LegoPathBoundary* FindPathBoundary(const char* p_name); LegoPathBoundary* FindPathBoundary(const char* p_name);

2
LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp
View File

@ -151,7 +151,7 @@ LegoAnimationManager::~LegoAnimationManager()
LegoPathActor* actor = CharacterManager()->GetActor(roi->GetName()); LegoPathActor* actor = CharacterManager()->GetActor(roi->GetName());
if (actor != NULL && actor->GetController() != NULL && CurrentWorld() != NULL) { if (actor != NULL && actor->GetController() != NULL && CurrentWorld() != NULL) {
CurrentWorld()->RemovePathActor((IslePathActor*) actor); CurrentWorld()->RemovePathActor(actor);
actor->SetController(NULL); actor->SetController(NULL);
} }

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

@ -296,7 +296,7 @@ MxResult LegoWorld::PlaceActor(
} }
// FUNCTION: LEGO1 0x1001fa70 // FUNCTION: LEGO1 0x1001fa70
MxResult LegoWorld::AddPathActor(IslePathActor* p_actor) MxResult LegoWorld::AddPathActor(LegoPathActor* p_actor)
{ {
LegoPathControllerListCursor cursor(&m_list0x68); LegoPathControllerListCursor cursor(&m_list0x68);
LegoPathController* controller; LegoPathController* controller;
@ -312,7 +312,7 @@ MxResult LegoWorld::AddPathActor(IslePathActor* p_actor)
// FUNCTION: LEGO1 0x1001fb70 // FUNCTION: LEGO1 0x1001fb70
MxResult LegoWorld::FUN_1001fb70( MxResult LegoWorld::FUN_1001fb70(
IslePathActor* p_actor, LegoPathActor* p_actor,
LegoAnimPresenter* p_presenter, LegoAnimPresenter* p_presenter,
Vector3& p_position, Vector3& p_position,
Vector3& p_direction Vector3& p_direction
@ -331,7 +331,7 @@ MxResult LegoWorld::FUN_1001fb70(
} }
// FUNCTION: LEGO1 0x1001fc80 // FUNCTION: LEGO1 0x1001fc80
void LegoWorld::RemovePathActor(IslePathActor* p_actor) void LegoWorld::RemovePathActor(LegoPathActor* p_actor)
{ {
LegoPathControllerListCursor cursor(&m_list0x68); LegoPathControllerListCursor cursor(&m_list0x68);
LegoPathController* controller; LegoPathController* controller;
@ -503,7 +503,7 @@ void LegoWorld::Remove(MxCore* p_object)
} }
else if (p_object->IsA("MxEntity")) { else if (p_object->IsA("MxEntity")) {
if (p_object->IsA("LegoPathActor")) { if (p_object->IsA("LegoPathActor")) {
RemovePathActor((IslePathActor*) p_object); RemovePathActor((LegoPathActor*) p_object);
} }
if (m_entityList) { if (m_entityList) {