From 2686643d20bd59c8d6d735788c53fb8831dedd4b Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Fri, 22 Dec 2023 13:57:23 -0500 Subject: [PATCH] Replace magic values with proper flag clearing --- LEGO1/mxflcpresenter.cpp | 4 ++-- LEGO1/mxloopingflcpresenter.cpp | 4 ++-- LEGO1/mxloopingsmkpresenter.cpp | 4 ++-- LEGO1/mxsmkpresenter.cpp | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/LEGO1/mxflcpresenter.cpp b/LEGO1/mxflcpresenter.cpp index 8c49505d..76cc7efe 100644 --- a/LEGO1/mxflcpresenter.cpp +++ b/LEGO1/mxflcpresenter.cpp @@ -12,8 +12,8 @@ DECOMP_SIZE_ASSERT(MxFlcPresenter, 0x68); MxFlcPresenter::MxFlcPresenter() { this->m_flicHeader = NULL; - this->m_flags &= 0xfd; - this->m_flags &= 0xfb; + this->m_flags &= ~Flag_Bit2; + this->m_flags &= ~Flag_Bit3; } // FUNCTION: LEGO1 0x100b3420 diff --git a/LEGO1/mxloopingflcpresenter.cpp b/LEGO1/mxloopingflcpresenter.cpp index 4a8b3ff1..cb4fd40b 100644 --- a/LEGO1/mxloopingflcpresenter.cpp +++ b/LEGO1/mxloopingflcpresenter.cpp @@ -20,8 +20,8 @@ MxLoopingFlcPresenter::~MxLoopingFlcPresenter() void MxLoopingFlcPresenter::Init() { this->m_unk0x68 = 0; - this->m_flags &= 0xfd; - this->m_flags &= 0xfb; + this->m_flags &= ~Flag_Bit2; + this->m_flags &= ~Flag_Bit3; } // STUB: LEGO1 0x100b4432 diff --git a/LEGO1/mxloopingsmkpresenter.cpp b/LEGO1/mxloopingsmkpresenter.cpp index 7f9a5851..b000c835 100644 --- a/LEGO1/mxloopingsmkpresenter.cpp +++ b/LEGO1/mxloopingsmkpresenter.cpp @@ -21,8 +21,8 @@ MxLoopingSmkPresenter::~MxLoopingSmkPresenter() void MxLoopingSmkPresenter::Init() { this->m_elapsedDuration = 0; - this->m_flags &= 0xfd; - this->m_flags &= 0xfb; + this->m_flags &= ~Flag_Bit2; + this->m_flags &= ~Flag_Bit3; } // FUNCTION: LEGO1 0x100b49d0 diff --git a/LEGO1/mxsmkpresenter.cpp b/LEGO1/mxsmkpresenter.cpp index 709151c3..17985fdd 100644 --- a/LEGO1/mxsmkpresenter.cpp +++ b/LEGO1/mxsmkpresenter.cpp @@ -23,8 +23,8 @@ void MxSmkPresenter::Init() { m_currentFrame = 0; memset(&m_mxSmack, 0, sizeof(m_mxSmack)); - m_flags &= 0xfd; - m_flags &= 0xfb; + m_flags &= ~Flag_Bit2; + m_flags &= ~Flag_Bit3; } // FUNCTION: LEGO1 0x100b3900