mirrors/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2025-10-23 08:24:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move some functions from LegoWorld to Act3 (#493)

Browse Source
This commit is contained in:
Christian Semmler
2024-01-27 12:15:14 -05:00
committed by GitHub
parent 883f3429a7
commit fadf8e7fd5
5 changed files with 31 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
LEGO1/lego/legoomni/include/act3.h
View File

@@ -41,6 +41,11 @@ public:
// SYNTHETIC: LEGO1 0x10072630 // SYNTHETIC: LEGO1 0x10072630
// Act3::`scalar deleting destructor' // Act3::`scalar deleting destructor'
MxBool FUN_100727e0(MxU32, Mx3DPointFloat& p_loc, Mx3DPointFloat& p_dir, Mx3DPointFloat& p_up);
MxBool FUN_10072980(MxU32, Mx3DPointFloat& p_loc, Mx3DPointFloat& p_dir, Mx3DPointFloat& p_up);
void FUN_10073400();
void FUN_10073430();
protected: protected:
undefined m_unk0xf8[0x4114]; // 0xf8 undefined m_unk0xf8[0x4114]; // 0xf8
MxEntity* m_unk0x420c; // 0x420c MxEntity* m_unk0x420c; // 0x420c

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

@@ -62,10 +62,6 @@ public:
undefined FUN_100220e0(); undefined FUN_100220e0();
void Remove(MxCore* p_object); void Remove(MxCore* p_object);
void FUN_1001fc80(IslePathActor* p_actor); void FUN_1001fc80(IslePathActor* p_actor);
MxBool FUN_100727e0(MxU32, Mx3DPointFloat& p_loc, Mx3DPointFloat& p_dir, Mx3DPointFloat& p_up);
MxBool FUN_10072980(MxU32, Mx3DPointFloat& p_loc, Mx3DPointFloat& p_dir, Mx3DPointFloat& p_up);
void FUN_10073400();
void FUN_10073430();
MxS32 GetCurrPathInfo(LegoPathBoundary** p_path, MxS32& p_value); MxS32 GetCurrPathInfo(LegoPathBoundary** p_path, MxS32& p_value);
MxCore* Find(const char* p_class, const char* p_name); MxCore* Find(const char* p_class, const char* p_name);
MxCore* Find(const MxAtomId& p_atom, MxS32 p_entityId); MxCore* Find(const MxAtomId& p_atom, MxS32 p_entityId);

22
LEGO1/lego/legoomni/src/act3/act3.cpp
View File

@@ -21,6 +21,18 @@ Act3::~Act3()
// TODO // TODO
} }
// STUB: LEGO1 0x100727e0
MxBool Act3::FUN_100727e0(MxU32, Mx3DPointFloat& p_loc, Mx3DPointFloat& p_dir, Mx3DPointFloat& p_up)
{
return FALSE;
}
// STUB: LEGO1 0x10072980
MxBool Act3::FUN_10072980(MxU32, Mx3DPointFloat& p_loc, Mx3DPointFloat& p_dir, Mx3DPointFloat& p_up)
{
return FALSE;
}
// STUB: LEGO1 0x10072c30 // STUB: LEGO1 0x10072c30
MxResult Act3::Create(MxDSAction& p_dsAction) MxResult Act3::Create(MxDSAction& p_dsAction)
{ {
@@ -54,6 +66,16 @@ MxResult Act3::Tickle()
return SUCCESS; return SUCCESS;
} }
// STUB: LEGO1 0x10073400
void Act3::FUN_10073400()
{
}
// STUB: LEGO1 0x10073430
void Act3::FUN_10073430()
{
}
// STUB: LEGO1 0x10073a90 // STUB: LEGO1 0x10073a90
void Act3::VTable0x68(MxBool p_add) void Act3::VTable0x68(MxBool p_add)
{ {

8
LEGO1/lego/legoomni/src/build/helicopter.cpp
View File

@@ -197,9 +197,9 @@ MxU32 Helicopter::VTable0xd4(MxType17NotificationParam& p_param)
va4.EqualsCross(v68, dir); va4.EqualsCross(v68, dir);
v7c.EqualsCross(va4, v90); v7c.EqualsCross(va4, v90);
if (ret) if (ret)
if (m_world->FUN_100727e0(m_unk0x138, loc, dir, v7c)) if (((Act3*) m_world)->FUN_100727e0(m_unk0x138, loc, dir, v7c))
break; break;
else if (m_world->FUN_10072980(m_unk0x138, loc, dir, v7c)) else if (((Act3*) m_world)->FUN_10072980(m_unk0x138, loc, dir, v7c))
break; break;
} }
ret = 1; ret = 1;
@@ -329,9 +329,9 @@ void Helicopter::VTable0x70(float p_float)
} }
else { else {
if (state == 4) if (state == 4)
m_world->FUN_10073400(); ((Act3*) m_world)->FUN_10073400();
else else
m_world->FUN_10073430(); ((Act3*) m_world)->FUN_10073430();
m_unk0xdc = 4; m_unk0xdc = 4;
} }
} }

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

@@ -522,25 +522,3 @@ void LegoWorld::VTable0x50()
{ {
TickleManager()->UnregisterClient(this); TickleManager()->UnregisterClient(this);
} }
// STUB: LEGO1 0x100727e0
MxBool LegoWorld::FUN_100727e0(MxU32, Mx3DPointFloat& p_loc, Mx3DPointFloat& p_dir, Mx3DPointFloat& p_up)
{
return FALSE;
}
// STUB: LEGO1 0x10072980
MxBool LegoWorld::FUN_10072980(MxU32, Mx3DPointFloat& p_loc, Mx3DPointFloat& p_dir, Mx3DPointFloat& p_up)
{
return FALSE;
}
// STUB: LEGO1 0x10073400
void LegoWorld::FUN_10073400()
{
}
// STUB: LEGO1 0x10073430
void LegoWorld::FUN_10073430()
{
}