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

Improve naming

Browse Source
This commit is contained in:
Christian Semmler 2024-05-21 14:54:49 -04:00
parent 4a207a1048
commit 5a73b8ba11
2 changed files with 8 additions and 8 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 // FUNCTION: LEGO1 0x10047470
~LegoPathStruct() override {} ~LegoPathStruct() override {}
virtual void TriggerPathStruct(LegoPathActor* p_actor, MxBool p_bool1, MxU32 p_data); // vtable+0x04 virtual void TriggerPathStruct(LegoPathActor* p_actor, MxBool p_direction, MxU32 p_data); // vtable+0x04
inline void SetWorld(LegoWorld* p_world) { m_world = p_world; } inline void SetWorld(LegoWorld* p_world) { m_world = p_world; }
inline void SetAtomId(const MxAtomId& p_atomId) { m_atomId = p_atomId; } inline void SetAtomId(const MxAtomId& p_atomId) { m_atomId = p_atomId; }
private: private:
MxBool HandleTrigger(LegoPathActor* p_actor, MxBool p_direction, MxU32 p_data, MxBool p_bool2); MxBool HandleTrigger(LegoPathActor* p_actor, MxBool p_direction, MxU32 p_data, MxBool p_bool);
void FUN_1001bc40(const char* p_name, MxU32 p_data, MxBool p_bool); void FUN_1001bc40(const char* p_name, MxU32 p_data, MxBool p_bool);
void PlayMusic(MxBool p_direction, MxU32 p_data); void PlayMusic(MxBool p_direction, MxU32 p_data);

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

@ -32,12 +32,12 @@ void LegoPathStruct::TriggerPathStruct(LegoPathActor* p_actor, MxBool p_directio
// FUNCTION: LEGO1 0x1001b740 // FUNCTION: LEGO1 0x1001b740
// FUNCTION: BETA10 0x100c26c5 // FUNCTION: BETA10 0x100c26c5
MxBool LegoPathStruct::HandleTrigger(LegoPathActor* p_actor, MxBool p_direction, MxU32 p_data, MxBool p_bool2) MxBool LegoPathStruct::HandleTrigger(LegoPathActor* p_actor, MxBool p_direction, MxU32 p_data, MxBool p_bool)
{ {
MxBool triggered = FALSE; MxBool triggered = FALSE;
MxBool bool3 = p_bool2 ? !p_direction : p_direction; MxBool bool2 = p_bool ? !p_direction : p_direction;
MxU32 flags = bool3 ? c_bit5 : c_bit6; MxU32 flags = bool2 ? c_bit5 : c_bit6;
flags |= p_actor->GetCameraFlag() ? c_bit1 : (c_bit2 | c_bit3 | c_bit4); flags |= p_actor->GetCameraFlag() ? c_bit1 : (c_bit2 | c_bit3 | c_bit4);
if ((m_flags & flags & (c_bit5 | c_bit6 | c_bit7)) && (m_flags & flags & (c_bit1 | c_bit2 | c_bit3 | c_bit4))) { if ((m_flags & flags & (c_bit5 | c_bit6 | c_bit7)) && (m_flags & flags & (c_bit1 | c_bit2 | c_bit3 | c_bit4))) {
@ -46,7 +46,7 @@ MxBool LegoPathStruct::HandleTrigger(LegoPathActor* p_actor, MxBool p_direction,
switch (m_name[2]) { switch (m_name[2]) {
case c_camAnim: case c_camAnim:
if (g_unk0x100f1198 & Isle::c_bit6) { if (g_unk0x100f1198 & Isle::c_bit6) {
PlayCamAnim(p_actor, bool3, p_data, TRUE); PlayCamAnim(p_actor, bool2, p_data, TRUE);
} }
break; break;
case c_d: { case c_d: {
@ -62,7 +62,7 @@ MxBool LegoPathStruct::HandleTrigger(LegoPathActor* p_actor, MxBool p_direction,
break; break;
} }
case c_e: case c_e:
FUN_1001bc40(m_name, p_data, !(p_bool2 == FALSE)); FUN_1001bc40(m_name, p_data, !(p_bool == FALSE));
break; break;
case c_g: case c_g:
break; break;
@ -89,7 +89,7 @@ MxBool LegoPathStruct::HandleTrigger(LegoPathActor* p_actor, MxBool p_direction,
} }
} }
FUN_1001bc40(m_name, p_data, p_bool2 == FALSE); FUN_1001bc40(m_name, p_data, p_bool == FALSE);
break; break;
} }
case c_w: { case c_w: {