diff --git a/ISLE/isleapp.cpp b/ISLE/isleapp.cpp index a22f685b..82b68cc0 100644 --- a/ISLE/isleapp.cpp +++ b/ISLE/isleapp.cpp @@ -149,7 +149,7 @@ IsleApp::~IsleApp() void IsleApp::Close() { MxDSAction ds; - ds.SetUnknown24(-2); + ds.SetFlags(-2); if (Lego()) { GameState()->Save(0); @@ -859,7 +859,7 @@ inline void IsleApp::Tick(BOOL sleepIfNotNextFrame) } ds.SetAtomId(stream->GetAtom()); - ds.SetUnknown24(-1); + ds.SetFlags(-1); ds.SetObjectId(0); VideoManager()->EnableFullScreenMovie(TRUE, TRUE); @@ -869,7 +869,7 @@ inline void IsleApp::Tick(BOOL sleepIfNotNextFrame) } else { ds.SetAtomId(stream->GetAtom()); - ds.SetUnknown24(-1); + ds.SetFlags(-1); ds.SetObjectId(0); if (Start(&ds) != SUCCESS) { return; diff --git a/LEGO1/lego/legoomni/src/audio/mxbackgroundaudiomanager.cpp b/LEGO1/lego/legoomni/src/audio/mxbackgroundaudiomanager.cpp index d89f5cd4..e86dd8c5 100644 --- a/LEGO1/lego/legoomni/src/audio/mxbackgroundaudiomanager.cpp +++ b/LEGO1/lego/legoomni/src/audio/mxbackgroundaudiomanager.cpp @@ -71,7 +71,7 @@ void MxBackgroundAudioManager::DestroyMusic() if (m_script.GetInternal()) { MxDSAction ds; ds.SetAtomId(m_script); - ds.SetUnknown24(-2); + ds.SetFlags(-2); DeleteObject(ds); Streamer()->Close(m_script.GetInternal()); m_enabled = FALSE; @@ -257,7 +257,7 @@ MxResult MxBackgroundAudioManager::PlayMusic( MxDSAction action; action.SetAtomId(GetCurrentAction().GetAtomId()); action.SetObjectId(GetCurrentAction().GetObjectId()); - action.SetUnknown24(GetCurrentAction().GetUnknown24()); + action.SetFlags(GetCurrentAction().GetUnknown24()); m_action2.SetAtomId(p_action.GetAtomId()); m_action2.SetObjectId(p_action.GetObjectId()); @@ -268,7 +268,7 @@ MxResult MxBackgroundAudioManager::PlayMusic( GetCurrentAction().SetAtomId(action.GetAtomId()); GetCurrentAction().SetObjectId(action.GetObjectId()); - GetCurrentAction().SetUnknown24(action.GetUnknown24()); + GetCurrentAction().SetFlags(action.GetUnknown24()); if (result == SUCCESS) { m_tickleState = p_tickleState; diff --git a/LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp b/LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp index 51f9cea1..08f6abed 100644 --- a/LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp +++ b/LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp @@ -1012,7 +1012,7 @@ MxResult LegoAnimationManager::FUN_100605e0( action.SetAtomId(*Lego()->GetWorldAtom(m_worldId)); action.SetObjectId(animInfo.m_objectId); - action.SetUnknown24(-1); + action.SetFlags(-1); action.AppendExtra(strlen(buf) + 1, buf); if (StartActionIfUnknown0x13c(action) == SUCCESS) { @@ -1079,7 +1079,7 @@ MxResult LegoAnimationManager::FUN_100609f0(MxU32 p_objectId, MxMatrix* p_matrix action.SetAtomId(*Lego()->GetWorldAtom(m_worldId)); action.SetObjectId(p_objectId); - action.SetUnknown24(-1); + action.SetFlags(-1); action.AppendExtra(strlen(buf) + 1, buf); if (StartActionIfUnknown0x13c(action) == SUCCESS) { diff --git a/LEGO1/lego/legoomni/src/common/legoutils.cpp b/LEGO1/lego/legoomni/src/common/legoutils.cpp index d141e32c..ac8066d7 100644 --- a/LEGO1/lego/legoomni/src/common/legoutils.cpp +++ b/LEGO1/lego/legoomni/src/common/legoutils.cpp @@ -294,7 +294,7 @@ void InvokeAction(Extra::ActionType p_actionId, const MxAtomId& p_pAtom, MxS32 p break; case Extra::ActionType::e_close: - action.SetUnknown24(-2); + action.SetFlags(-2); DeleteObject(action); Streamer()->Close(p_pAtom.GetInternal()); break; @@ -308,7 +308,7 @@ void InvokeAction(Extra::ActionType p_actionId, const MxAtomId& p_pAtom, MxS32 p break; case Extra::ActionType::e_stop: assert(p_streamId != DS_NOT_A_STREAM); - action.SetUnknown24(-2); + action.SetFlags(-2); if (!RemoveFromCurrentWorld(p_pAtom, p_streamId)) { DeleteObject(action); diff --git a/LEGO1/lego/legoomni/src/common/misc.cpp b/LEGO1/lego/legoomni/src/common/misc.cpp index 08072b7c..2431c092 100644 --- a/LEGO1/lego/legoomni/src/common/misc.cpp +++ b/LEGO1/lego/legoomni/src/common/misc.cpp @@ -239,7 +239,7 @@ void DeleteObjects(MxAtomId* p_id, MxS32 p_first, MxS32 p_last) MxDSAction action; action.SetAtomId(*p_id); - action.SetUnknown24(-2); + action.SetFlags(-2); for (MxS32 first = p_first, last = p_last; first <= last; first++) { action.SetObjectId(first); diff --git a/LEGO1/lego/legoomni/src/main/legomain.cpp b/LEGO1/lego/legoomni/src/main/legomain.cpp index fe37070c..49165071 100644 --- a/LEGO1/lego/legoomni/src/main/legomain.cpp +++ b/LEGO1/lego/legoomni/src/main/legomain.cpp @@ -550,7 +550,7 @@ MxResult LegoOmni::Start(MxDSAction* p_dsAction) MxResult result = MxOmni::Start(p_dsAction); this->m_action.SetAtomId(p_dsAction->GetAtomId()); this->m_action.SetObjectId(p_dsAction->GetObjectId()); - this->m_action.SetUnknown24(p_dsAction->GetUnknown24()); + this->m_action.SetFlags(p_dsAction->GetUnknown24()); return result; } diff --git a/LEGO1/lego/legoomni/src/paths/legopathstruct.cpp b/LEGO1/lego/legoomni/src/paths/legopathstruct.cpp index e269f727..f8920357 100644 --- a/LEGO1/lego/legoomni/src/paths/legopathstruct.cpp +++ b/LEGO1/lego/legoomni/src/paths/legopathstruct.cpp @@ -114,11 +114,11 @@ void LegoPathStruct::FUN_1001bc40(const char* p_name, MxU32 p_data, MxBool p_boo action.SetAtomId(m_atomId); if (p_bool) { - action.SetUnknown24(-1); + action.SetFlags(-1); Start(&action); } else { - action.SetUnknown24(-2); + action.SetFlags(-2); DeleteObject(action); } } @@ -155,7 +155,7 @@ void LegoPathStruct::PlayMusic(MxBool p_direction, MxU32 p_data) MxDSAction action; action.SetAtomId(*g_jukeboxScript); - action.SetUnknown24(-1); + action.SetFlags(-1); if (p_data <= sizeOfArray(triggersReff)) { action.SetObjectId(music[triggersReff[p_data - 1][p_direction == FALSE] - 1]); diff --git a/LEGO1/lego/legoomni/src/worlds/infocenter.cpp b/LEGO1/lego/legoomni/src/worlds/infocenter.cpp index 5cc9138c..c450a3df 100644 --- a/LEGO1/lego/legoomni/src/worlds/infocenter.cpp +++ b/LEGO1/lego/legoomni/src/worlds/infocenter.cpp @@ -1494,7 +1494,7 @@ void Infocenter::StopCredits() MxDSAction action; action.SetObjectId(CreditsScript::c_LegoCredits); action.SetAtomId(*g_creditsScript); - action.SetUnknown24(-2); + action.SetFlags(-2); DeleteObject(action); } @@ -1519,7 +1519,7 @@ void Infocenter::StopCurrentAction() MxDSAction action; action.SetObjectId(m_currentInfomainScript); action.SetAtomId(*g_infomainScript); - action.SetUnknown24(-2); + action.SetFlags(-2); DeleteObject(action); m_currentInfomainScript = InfomainScript::c_noneInfomain; } @@ -1540,7 +1540,7 @@ void Infocenter::StopBookAnimation() MxDSAction action; action.SetObjectId(SndanimScript::c_BookWig_Flic); action.SetAtomId(*g_sndAnimScript); - action.SetUnknown24(-2); + action.SetFlags(-2); DeleteObject(action); } diff --git a/LEGO1/lego/legoomni/src/worlds/isle.cpp b/LEGO1/lego/legoomni/src/worlds/isle.cpp index 5fb87505..1d255715 100644 --- a/LEGO1/lego/legoomni/src/worlds/isle.cpp +++ b/LEGO1/lego/legoomni/src/worlds/isle.cpp @@ -401,7 +401,7 @@ MxLong Isle::HandleControl(LegoControlManagerNotificationParam& p_param) case IsleScript::c_Observe_LCab_Ctl: action.SetAtomId(*g_isleScript); action.SetObjectId(IsleScript::c_Observe_Monkey_Flc); - action.SetUnknown24(0); + action.SetFlags(0); Start(&action); break; case IsleScript::c_Observe_RCab_Ctl: diff --git a/LEGO1/lego/legoomni/src/worlds/legoact2.cpp b/LEGO1/lego/legoomni/src/worlds/legoact2.cpp index 9f8e7793..8bbf69f2 100644 --- a/LEGO1/lego/legoomni/src/worlds/legoact2.cpp +++ b/LEGO1/lego/legoomni/src/worlds/legoact2.cpp @@ -580,7 +580,7 @@ void LegoAct2::Enable(MxBool p_enable) if (m_unk0x1144 != (Act2mainScript::Script) 0) { MxDSAction action; action.SetAtomId(m_atomId); - action.SetUnknown24(-2); + action.SetFlags(-2); action.SetObjectId(m_unk0x1144); DeleteObject(action); m_unk0x1144 = (Act2mainScript::Script) 0; diff --git a/LEGO1/lego/legoomni/src/worlds/registrationbook.cpp b/LEGO1/lego/legoomni/src/worlds/registrationbook.cpp index adc7c856..69e6f952 100644 --- a/LEGO1/lego/legoomni/src/worlds/registrationbook.cpp +++ b/LEGO1/lego/legoomni/src/worlds/registrationbook.cpp @@ -190,7 +190,7 @@ MxLong RegistrationBook::HandleKeyPress(MxU8 p_key) m_name[0][m_unk0x280.m_cursorPos] = m_alphabet[key - 'A']->Clone(); if (m_name[0][m_unk0x280.m_cursorPos] != NULL) { - m_alphabet[key - 'A']->GetAction()->SetUnknown24(m_alphabet[key - 'A']->GetAction()->GetUnknown24() + 1); + m_alphabet[key - 'A']->GetAction()->SetFlags(m_alphabet[key - 'A']->GetAction()->GetUnknown24() + 1); m_name[0][m_unk0x280.m_cursorPos]->Enable(TRUE); m_name[0][m_unk0x280.m_cursorPos]->SetTickleState(MxPresenter::e_repeating); m_name[0][m_unk0x280.m_cursorPos]->SetPosition(m_unk0x280.m_cursorPos * 23 + 343, 121); diff --git a/LEGO1/lego/legoomni/src/worlds/score.cpp b/LEGO1/lego/legoomni/src/worlds/score.cpp index b5b66d87..5181b306 100644 --- a/LEGO1/lego/legoomni/src/worlds/score.cpp +++ b/LEGO1/lego/legoomni/src/worlds/score.cpp @@ -71,7 +71,7 @@ void Score::DeleteScript() MxDSAction action; action.SetObjectId(InfoscorScript::c_iicc31in_PlayWav); action.SetAtomId(*g_infoscorScript); - action.SetUnknown24(-2); + action.SetFlags(-2); DeleteObject(action); m_state->SetTutorialFlag(FALSE); } diff --git a/LEGO1/omni/include/mxactionnotificationparam.h b/LEGO1/omni/include/mxactionnotificationparam.h index 79c18ee0..9b357cb4 100644 --- a/LEGO1/omni/include/mxactionnotificationparam.h +++ b/LEGO1/omni/include/mxactionnotificationparam.h @@ -26,7 +26,7 @@ class MxActionNotificationParam : public MxNotificationParam { m_action->SetAtomId(oldAction->GetAtomId()); m_action->SetObjectId(oldAction->GetObjectId()); - m_action->SetUnknown24(oldAction->GetUnknown24()); + m_action->SetFlags(oldAction->GetUnknown24()); } // FUNCTION: LEGO1 0x10051050 diff --git a/LEGO1/omni/include/mxdsobject.h b/LEGO1/omni/include/mxdsobject.h index 5f60bfee..03601e84 100644 --- a/LEGO1/omni/include/mxdsobject.h +++ b/LEGO1/omni/include/mxdsobject.h @@ -88,7 +88,7 @@ class MxDSObject : public MxCore { // FUNCTION: BETA10 0x10017940 const MxAtomId& GetAtomId() { return m_atomId; } - MxS16 GetUnknown24() { return m_unk0x24; } + MxS16 GetUnknown24() { return m_flags; } MxPresenter* GetUnknown28() { return m_unk0x28; } void SetType(Type p_type) { m_type = p_type; } @@ -97,7 +97,7 @@ class MxDSObject : public MxCore { void SetObjectId(MxU32 p_objectId) { m_objectId = p_objectId; } // FUNCTION: BETA10 0x10039570 - void SetUnknown24(MxS16 p_unk0x24) { m_unk0x24 = p_unk0x24; } + void SetFlags(MxS16 p_flags) { m_flags = p_flags; } void SetUnknown28(MxPresenter* p_unk0x28) { m_unk0x28 = p_unk0x28; } @@ -115,7 +115,7 @@ class MxDSObject : public MxCore { char* m_objectName; // 0x18 MxU32 m_objectId; // 0x1c MxAtomId m_atomId; // 0x20 - MxS16 m_unk0x24; // 0x24 + MxS16 m_flags; // 0x24 MxPresenter* m_unk0x28; // 0x28 }; diff --git a/LEGO1/omni/src/action/mxdsobject.cpp b/LEGO1/omni/src/action/mxdsobject.cpp index ed2a43e8..c83a58ec 100644 --- a/LEGO1/omni/src/action/mxdsobject.cpp +++ b/LEGO1/omni/src/action/mxdsobject.cpp @@ -29,7 +29,7 @@ MxDSObject::MxDSObject() m_unk0x14 = 0; m_objectName = NULL; m_objectId = -1; - m_unk0x24 = -1; + m_flags = -1; m_unk0x28 = NULL; } @@ -49,7 +49,7 @@ void MxDSObject::CopyFrom(MxDSObject& p_dsObject) m_unk0x14 = p_dsObject.m_unk0x14; SetObjectName(p_dsObject.m_objectName); m_objectId = p_dsObject.m_objectId; - m_unk0x24 = p_dsObject.m_unk0x24; + m_flags = p_dsObject.m_flags; m_atomId = p_dsObject.m_atomId; m_unk0x28 = p_dsObject.m_unk0x28; } @@ -170,7 +170,7 @@ void MxDSObject::Deserialize(MxU8*& p_source, MxS16 p_flags) m_objectId = *(MxU32*) p_source; p_source += sizeof(m_objectId); - m_unk0x24 = p_flags; + m_flags = p_flags; } // FUNCTION: LEGO1 0x100bfa80 diff --git a/LEGO1/omni/src/main/mxomni.cpp b/LEGO1/omni/src/main/mxomni.cpp index d7e79bb0..19ea2204 100644 --- a/LEGO1/omni/src/main/mxomni.cpp +++ b/LEGO1/omni/src/main/mxomni.cpp @@ -184,7 +184,7 @@ void MxOmni::Destroy() { MxDSAction action; action.SetObjectId(-1); - action.SetUnknown24(-2); + action.SetFlags(-2); DeleteObject(action); } diff --git a/LEGO1/omni/src/stream/mxramstreamcontroller.cpp b/LEGO1/omni/src/stream/mxramstreamcontroller.cpp index c856d695..54cde753 100644 --- a/LEGO1/omni/src/stream/mxramstreamcontroller.cpp +++ b/LEGO1/omni/src/stream/mxramstreamcontroller.cpp @@ -42,12 +42,12 @@ MxResult MxRAMStreamController::VTable0x20(MxDSAction* p_action) MxResult result = FAILURE; if (p_action->GetUnknown24() == -1) { - p_action->SetUnknown24(-3); + p_action->SetFlags(-3); MxDSObject* action = m_unk0x54.Find(p_action); if (action != NULL) { unk0x24 = action->GetUnknown24() + 1; } - p_action->SetUnknown24(unk0x24); + p_action->SetFlags(unk0x24); } else { if (m_unk0x54.Find(p_action)) { diff --git a/LEGO1/omni/src/stream/mxstreamcontroller.cpp b/LEGO1/omni/src/stream/mxstreamcontroller.cpp index dadd03ca..a9a0c542 100644 --- a/LEGO1/omni/src/stream/mxstreamcontroller.cpp +++ b/LEGO1/omni/src/stream/mxstreamcontroller.cpp @@ -127,7 +127,7 @@ MxResult MxStreamController::VTable0x24(MxDSAction* p_action) return FAILURE; } else { - p_action->SetUnknown24(m_action0x60->GetUnknown24()); + p_action->SetFlags(m_action0x60->GetUnknown24()); p_action->SetObjectId(m_action0x60->GetObjectId()); return FUN_100c1f00(m_action0x60); } @@ -183,7 +183,7 @@ MxResult MxStreamController::FUN_100c1a00(MxDSAction* p_action, MxU32 p_offset) } } - p_action->SetUnknown24(newUnknown24 + 1); + p_action->SetFlags(newUnknown24 + 1); } else { if (m_unk0x3c.Find(p_action)) { diff --git a/LEGO1/omni/src/stream/mxstreamer.cpp b/LEGO1/omni/src/stream/mxstreamer.cpp index bb5f1cb5..a05fc93f 100644 --- a/LEGO1/omni/src/stream/mxstreamer.cpp +++ b/LEGO1/omni/src/stream/mxstreamer.cpp @@ -98,7 +98,7 @@ MxStreamController* MxStreamer::Open(const char* p_name, MxU16 p_lookupType) MxLong MxStreamer::Close(const char* p_name) { MxDSAction ds; - ds.SetUnknown24(-2); + ds.SetFlags(-2); for (list::iterator it = m_controllers.begin(); it != m_controllers.end(); it++) { MxStreamController* c = *it; @@ -192,10 +192,10 @@ MxResult MxStreamer::DeleteObject(MxDSAction* p_dsAction) if (p_dsAction) { tempAction.SetObjectId(p_dsAction->GetObjectId()); tempAction.SetAtomId(p_dsAction->GetAtomId()); - tempAction.SetUnknown24(p_dsAction->GetUnknown24()); + tempAction.SetFlags(p_dsAction->GetUnknown24()); } else { - tempAction.SetUnknown24(-2); + tempAction.SetFlags(-2); } MxResult result = FAILURE; @@ -233,7 +233,7 @@ MxLong MxStreamer::Notify(MxParam& p_param) MxStreamController* c = s.GetController(); MxDSAction ds; - ds.SetUnknown24(-2); + ds.SetFlags(-2); if (c->IsStoped(&ds)) { delete c;