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

Clear unknown in mxutilities.h (#1598)

Browse Source 
Also change the parameter name to mask as it better represents the
usage.
This commit is contained in:
Fabian Neundorf
2025-07-01 00:29:23 +02:00
committed by GitHub
parent f0df3cd0ef
commit f825b053ff
6 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
LEGO1/lego/legoomni/src/common/legoutils.cpp
View File

@@ -507,7 +507,7 @@ MxBool RemoveFromCurrentWorld(const MxAtomId& p_atomId, MxS32 p_id)
} }
else { else {
if (((MxPresenter*) object)->GetAction()) { if (((MxPresenter*) object)->GetAction()) {
FUN_100b7220(((MxPresenter*) object)->GetAction(), MxDSAction::c_world, FALSE); ApplyMask(((MxPresenter*) object)->GetAction(), MxDSAction::c_world, FALSE);
} }
((MxPresenter*) object)->EndAction(); ((MxPresenter*) object)->EndAction();
@@ -536,7 +536,7 @@ MxBool RemoveFromWorld(MxAtomId& p_entityAtom, MxS32 p_entityId, MxAtomId& p_wor
} }
else { else {
if (((MxPresenter*) object)->GetAction()) { if (((MxPresenter*) object)->GetAction()) {
FUN_100b7220(((MxPresenter*) object)->GetAction(), MxDSAction::c_world, FALSE); ApplyMask(((MxPresenter*) object)->GetAction(), MxDSAction::c_world, FALSE);
} }
((MxPresenter*) object)->EndAction(); ((MxPresenter*) object)->EndAction();

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

@@ -44,7 +44,7 @@ MxResult MxControlPresenter::StartAction(MxStreamController* p_controller, MxDSA
{ {
MxResult result = MxCompositePresenter::StartAction(p_controller, p_action); MxResult result = MxCompositePresenter::StartAction(p_controller, p_action);
FUN_100b7220(m_action, MxDSAction::c_world | MxDSAction::c_looping, TRUE); ApplyMask(m_action, MxDSAction::c_world | MxDSAction::c_looping, TRUE);
ParseExtra(); ParseExtra();
MxS16 i = 0; MxS16 i = 0;

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

@@ -120,12 +120,12 @@ void LegoWorld::Destroy(MxBool p_fromDestructor)
animPresenter->DecrementUnknown0xd4(); animPresenter->DecrementUnknown0xd4();
if (animPresenter->GetUnknown0xd4() == 0) { if (animPresenter->GetUnknown0xd4() == 0) {
FUN_100b7220(action, MxDSAction::c_world, FALSE); ApplyMask(action, MxDSAction::c_world, FALSE);
presenter->EndAction(); presenter->EndAction();
} }
} }
else { else {
FUN_100b7220(action, MxDSAction::c_world, FALSE); ApplyMask(action, MxDSAction::c_world, FALSE);
presenter->EndAction(); presenter->EndAction();
} }
} }
@@ -141,7 +141,7 @@ void LegoWorld::Destroy(MxBool p_fromDestructor)
MxDSAction* action = presenter->GetAction(); MxDSAction* action = presenter->GetAction();
if (action) { if (action) {
FUN_100b7220(action, MxDSAction::c_world, FALSE); ApplyMask(action, MxDSAction::c_world, FALSE);
presenter->EndAction(); presenter->EndAction();
} }
} }
@@ -157,7 +157,7 @@ void LegoWorld::Destroy(MxBool p_fromDestructor)
MxDSAction* action = presenter->GetAction(); MxDSAction* action = presenter->GetAction();
if (action) { if (action) {
FUN_100b7220(action, MxDSAction::c_world, FALSE); ApplyMask(action, MxDSAction::c_world, FALSE);
presenter->EndAction(); presenter->EndAction();
} }
} }

4
LEGO1/lego/legoomni/src/worlds/infocenter.cpp
View File

@@ -1450,7 +1450,7 @@ void Infocenter::StartCredits()
MxDSAction* action = presenter->GetAction(); MxDSAction* action = presenter->GetAction();
if (action) { if (action) {
FUN_100b7220(action, MxDSAction::c_world, FALSE); ApplyMask(action, MxDSAction::c_world, FALSE);
presenter->EndAction(); presenter->EndAction();
} }
} }
@@ -1466,7 +1466,7 @@ void Infocenter::StartCredits()
MxDSAction* action = presenter->GetAction(); MxDSAction* action = presenter->GetAction();
if (action) { if (action) {
FUN_100b7220(action, MxDSAction::c_world, FALSE); ApplyMask(action, MxDSAction::c_world, FALSE);
presenter->EndAction(); presenter->EndAction();
} }
} }

2
LEGO1/omni/include/mxutilities.h
View File

@@ -75,7 +75,7 @@ void MakeSourceName(char*, const char*);
void OmniError(const char* p_message, MxS32 p_status); void OmniError(const char* p_message, MxS32 p_status);
void SetOmniUserMessage(void (*p_omniUserMessage)(const char*, MxS32)); void SetOmniUserMessage(void (*p_omniUserMessage)(const char*, MxS32));
MxBool ContainsPresenter(MxCompositePresenterList& p_presenterList, MxPresenter* p_presenter); MxBool ContainsPresenter(MxCompositePresenterList& p_presenterList, MxPresenter* p_presenter);
void FUN_100b7220(MxDSAction* p_action, MxU32 p_newFlags, MxBool p_setFlags); void ApplyMask(MxDSAction* p_action, MxU32 p_mask, MxBool p_setFlags);
MxBool KeyValueStringParse(char*, const char*, const char*); MxBool KeyValueStringParse(char*, const char*, const char*);
// TEMPLATE: BETA10 0x1012dfd0 // TEMPLATE: BETA10 0x1012dfd0

8
LEGO1/omni/src/common/mxutilities.cpp
View File

@@ -150,16 +150,16 @@ void SetOmniUserMessage(void (*p_omniUserMessage)(const char*, MxS32))
// FUNCTION: LEGO1 0x100b7220 // FUNCTION: LEGO1 0x100b7220
// FUNCTION: BETA10 0x10136f37 // FUNCTION: BETA10 0x10136f37
void FUN_100b7220(MxDSAction* p_action, MxU32 p_newFlags, MxBool p_setFlags) void ApplyMask(MxDSAction* p_action, MxU32 p_mask, MxBool p_setFlags)
{ {
MxU32 oldFlags = p_action->GetFlags(); MxU32 oldFlags = p_action->GetFlags();
MxU32 newFlags; MxU32 newFlags;
if (p_setFlags) { if (p_setFlags) {
newFlags = oldFlags | p_newFlags; newFlags = oldFlags | p_mask;
} }
else { else {
newFlags = oldFlags & ~p_newFlags; newFlags = oldFlags & ~p_mask;
} }
p_action->SetFlags(newFlags); p_action->SetFlags(newFlags);
@@ -169,7 +169,7 @@ void FUN_100b7220(MxDSAction* p_action, MxU32 p_newFlags, MxBool p_setFlags)
MxDSAction* action; MxDSAction* action;
while (cursor.Next(action)) { while (cursor.Next(action)) {
FUN_100b7220(action, p_newFlags, p_setFlags); ApplyMask(action, p_mask, p_setFlags);
} }
} }
} }