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

Consistent naming

Browse Source
This commit is contained in:
Christian Semmler 2024-05-21 14:31:49 -04:00
parent 46b2870419
commit 2797068a97
5 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -57,13 +57,13 @@ class LegoPathStruct : public LegoPathStructBase {
// FUNCTION: LEGO1 0x10047470
~LegoPathStruct() override {}
virtual void VTable0x04(LegoPathActor* p_actor, MxBool p_bool1, MxU32 p_value); // vtable+0x04
virtual void VTable0x04(LegoPathActor* p_actor, MxBool p_bool1, MxU32 p_data); // vtable+0x04
inline void SetWorld(LegoWorld* p_world) { m_world = p_world; }
inline void SetAtomId(const MxAtomId& p_atomId) { m_atomId = p_atomId; }
private:
MxBool FUN_1001b740(LegoPathActor* p_actor, MxBool p_bool1, MxU32 p_value, MxBool p_bool2);
MxBool FUN_1001b740(LegoPathActor* p_actor, MxBool p_bool1, MxU32 p_data, MxBool p_bool2);
void FUN_1001bc40(const char* p_name, MxU32 p_objectId, MxBool p_bool);
void FUN_1001bd10(MxBool p_direction, MxU32 p_data);

4
LEGO1/lego/legoomni/src/paths/legopathboundary.cpp
View File

@ -64,7 +64,7 @@ void LegoPathBoundary::FUN_100575b0(Vector3& p_point1, Vector3& p_point2, LegoPa
LegoPathStruct* s = m_unk0x4c[i].m_pathStruct;
if (m_unk0x4c[i].m_unk0x08 >= dot1 && m_unk0x4c[i].m_unk0x08 < dot2) {
s->VTable0x04(p_actor, 1, m_unk0x4c[i].m_value);
s->VTable0x04(p_actor, 1, m_unk0x4c[i].m_data);
}
}
}
@ -73,7 +73,7 @@ void LegoPathBoundary::FUN_100575b0(Vector3& p_point1, Vector3& p_point2, LegoPa
LegoPathStruct* s = m_unk0x4c[i].m_pathStruct;
if (m_unk0x4c[i].m_unk0x08 >= dot2 && m_unk0x4c[i].m_unk0x08 < dot1) {
s->VTable0x04(p_actor, 0, m_unk0x4c[i].m_value);
s->VTable0x04(p_actor, 0, m_unk0x4c[i].m_data);
}
}
}

2
LEGO1/lego/legoomni/src/paths/legopathcontroller.cpp
View File

@ -687,7 +687,7 @@ MxResult LegoPathController::ReadBoundaries(LegoStorage* p_storage)
boundary.m_unk0x4c[j].m_pathStruct = &m_structs[s];
if (p_storage->Read(&boundary.m_unk0x4c[j].m_value, sizeof(boundary.m_unk0x4c[j].m_value)) != SUCCESS) {
if (p_storage->Read(&boundary.m_unk0x4c[j].m_data, sizeof(boundary.m_unk0x4c[j].m_data)) != SUCCESS) {
return FAILURE;
}

30
LEGO1/lego/legoomni/src/paths/legopathstruct.cpp
View File

@ -23,16 +23,16 @@ extern MxU32 g_unk0x100f1198;
MxBool g_unk0x100f119c = FALSE;
// FUNCTION: LEGO1 0x1001b700
void LegoPathStruct::VTable0x04(LegoPathActor* p_actor, MxBool p_bool1, MxU32 p_value)
void LegoPathStruct::VTable0x04(LegoPathActor* p_actor, MxBool p_bool1, MxU32 p_data)
{
if (!FUN_1001b740(p_actor, p_bool1, p_value, FALSE) && g_unk0x100f119c) {
FUN_1001b740(p_actor, p_bool1, p_value, TRUE);
if (!FUN_1001b740(p_actor, p_bool1, p_data, FALSE) && g_unk0x100f119c) {
FUN_1001b740(p_actor, p_bool1, p_data, TRUE);
}
}
// FUNCTION: LEGO1 0x1001b740
// FUNCTION: BETA10 0x100c26c5
MxBool LegoPathStruct::FUN_1001b740(LegoPathActor* p_actor, MxBool p_bool1, MxU32 p_value, MxBool p_bool2)
MxBool LegoPathStruct::FUN_1001b740(LegoPathActor* p_actor, MxBool p_bool1, MxU32 p_data, MxBool p_bool2)
{
MxBool triggered = FALSE;
MxBool bool3 = p_bool2 ? !p_bool1 : p_bool1;
@ -46,13 +46,13 @@ MxBool LegoPathStruct::FUN_1001b740(LegoPathActor* p_actor, MxBool p_bool1, MxU3
switch (m_name[2]) {
case c_camAnim:
if (g_unk0x100f1198 & Isle::c_bit6) {
PlayCamAnim(p_actor, bool3, p_value, TRUE);
PlayCamAnim(p_actor, bool3, p_data, TRUE);
}
break;
case c_D: {
p_actor->VTable0x58(p_value);
p_actor->VTable0x58(p_data);
MxType19NotificationParam param(c_notificationType19, p_actor, m_name[2], p_value);
MxType19NotificationParam param(c_notificationType19, p_actor, m_name[2], p_data);
p_actor->Notify(param);
LegoWorld* world = CurrentWorld();
@ -62,7 +62,7 @@ MxBool LegoPathStruct::FUN_1001b740(LegoPathActor* p_actor, MxBool p_bool1, MxU3
break;
}
case c_E:
FUN_1001bc40(m_name, p_value, !(p_bool2 == FALSE));
FUN_1001bc40(m_name, p_data, !(p_bool2 == FALSE));
break;
case c_G:
break;
@ -70,32 +70,32 @@ MxBool LegoPathStruct::FUN_1001b740(LegoPathActor* p_actor, MxBool p_bool1, MxU3
LegoHideAnimPresenter* presenter = m_world->GetHideAnimPresenter();
if (presenter != NULL) {
presenter->FUN_1006db40(p_value * 100);
presenter->FUN_1006db40(p_data * 100);
}
break;
}
case c_music:
if (g_unk0x100f1198 & Isle::c_bit7) {
FUN_1001bd10(p_bool1, p_value);
FUN_1001bd10(p_bool1, p_data);
}
break;
case c_S: {
LegoWorld* world = CurrentWorld();
if (world != NULL) {
MxType19NotificationParam param(c_notificationType19, p_actor, m_name[2], p_value);
MxType19NotificationParam param(c_notificationType19, p_actor, m_name[2], p_data);
if (world->Notify(param) != 0) {
break;
}
}
FUN_1001bc40(m_name, p_value, p_bool2 == FALSE);
FUN_1001bc40(m_name, p_data, p_bool2 == FALSE);
break;
}
case c_W: {
LegoWorld* world = CurrentWorld();
if (world != NULL) {
MxType19NotificationParam param(c_notificationType19, p_actor, m_name[2], p_value);
MxType19NotificationParam param(c_notificationType19, p_actor, m_name[2], p_data);
NotificationManager()->Send(world, param);
}
break;
@ -108,10 +108,10 @@ MxBool LegoPathStruct::FUN_1001b740(LegoPathActor* p_actor, MxBool p_bool1, MxU3
// FUNCTION: LEGO1 0x1001bc40
// FUNCTION: BETA10 0x100c2a6c
void LegoPathStruct::FUN_1001bc40(const char* p_name, MxU32 p_objectId, MxBool p_bool)
void LegoPathStruct::FUN_1001bc40(const char* p_name, MxU32 p_data, MxBool p_bool)
{
MxDSAction action;
action.SetObjectId(p_objectId);
action.SetObjectId(p_data);
action.SetAtomId(m_atomId);
if (p_bool) {

4
LEGO1/lego/sources/geom/legowegedge.h
View File

@ -26,12 +26,12 @@ class LegoWEGEdge : public LegoWEEdge {
PathWithTrigger()
{
m_pathStruct = NULL;
m_value = 0;
m_data = 0;
m_unk0x08 = 0.0f;
}
LegoPathStruct* m_pathStruct; // 0x00
unsigned int m_value; // 0x04
unsigned int m_data; // 0x04
float m_unk0x08; // 0x08
};