From 1f06b51df42d843ef412de2424963bf119bc928d Mon Sep 17 00:00:00 2001 From: Regan Green Date: Wed, 4 Oct 2023 08:55:43 -0400 Subject: [PATCH] MxTransitionManager::SubmitCopyRect Amendments --- LEGO1/mxdsaction.h | 11 ++++++----- LEGO1/mxtransitionmanager.cpp | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/LEGO1/mxdsaction.h b/LEGO1/mxdsaction.h index 9a351334..d06e7f15 100644 --- a/LEGO1/mxdsaction.h +++ b/LEGO1/mxdsaction.h @@ -18,6 +18,7 @@ class MxDSAction : public MxDSObject Flag_Bit3 = 0x04, Flag_Enabled = 0x20, Flag_Parsed = 0x80, + Flag_Bit9 = 0x200, }; __declspec(dllexport) MxDSAction(); @@ -52,18 +53,18 @@ class MxDSAction : public MxDSObject void AppendData(MxU16 p_extraLength, const char *p_extraData); - inline MxU32 GetFlags() { return this->m_flags; } - inline void SetFlags(MxU32 m_flags) { this->m_flags = m_flags; } + inline MxU32 GetFlags() { return m_flags; } + inline void SetFlags(MxU32 p_flags) { m_flags = p_flags; } inline char *GetExtraData() { return m_extraData; } inline MxU16 GetExtraLength() const { return m_extraLength; } inline MxLong GetStartTime() const { return m_startTime; } inline MxS32 GetLoopCount() { return m_loopCount; } - inline void SetLoopCount(MxS32 m_loopCount) { this->m_loopCount = m_loopCount; } + inline void SetLoopCount(MxS32 p_loopCount) { m_loopCount = m_loopCount; } inline const MxVector3Data &GetLocation() const { return m_location; } inline void SetOmni(MxOmni *p_omni) { m_omni = p_omni; } - inline MxBool IsLooping() const { return this->m_flags & Flag_Looping; } - inline MxBool IsBit3() const { return this->m_flags & Flag_Bit3; } + inline MxBool IsLooping() const { return m_flags & Flag_Looping; } + inline MxBool IsBit3() const { return m_flags & Flag_Bit3; } private: MxU32 m_sizeOnDisk; diff --git a/LEGO1/mxtransitionmanager.cpp b/LEGO1/mxtransitionmanager.cpp index 425fb37c..b61dd5bb 100644 --- a/LEGO1/mxtransitionmanager.cpp +++ b/LEGO1/mxtransitionmanager.cpp @@ -154,7 +154,7 @@ MxResult MxTransitionManager::StartTransition(TransitionType p_animationType, Mx MxDSAction *action = m_waitIndicator->GetAction(); action->SetLoopCount(10000); - action->SetFlags(action->GetFlags() | 0x200); + action->SetFlags(action->GetFlags() | MxDSAction::Flag_Bit9); } MxU32 time = timeGetTime();