From 2567c25984beb799c3d9d13482031d75af658d2f Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Tue, 15 Aug 2023 09:05:16 -0400 Subject: [PATCH] Use inline assignment operators --- LEGO1/mxdsstreamingaction.cpp | 4 ++-- LEGO1/mxdsstreamingaction.h | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/LEGO1/mxdsstreamingaction.cpp b/LEGO1/mxdsstreamingaction.cpp index 699fa0a3..ab04c19e 100644 --- a/LEGO1/mxdsstreamingaction.cpp +++ b/LEGO1/mxdsstreamingaction.cpp @@ -7,7 +7,7 @@ MxDSStreamingAction::MxDSStreamingAction(MxDSAction &p_dsAction, MxU32 p_offset) { Init(); - MxDSAction::operator=(p_dsAction); + *this = p_dsAction; this->m_unk94 = p_offset; this->m_bufferOffset = p_offset; } @@ -34,7 +34,7 @@ MxDSStreamingAction::~MxDSStreamingAction() // OFFSET: LEGO1 0x100cd220 MxDSStreamingAction *MxDSStreamingAction::CopyFrom(MxDSStreamingAction &p_dsStreamingAction) { - MxDSAction::operator=(p_dsStreamingAction); + *this = p_dsStreamingAction; this->m_unk94 = p_dsStreamingAction.m_unk94; this->m_bufferOffset = p_dsStreamingAction.m_bufferOffset; this->m_unk9c = p_dsStreamingAction.m_unk9c; diff --git a/LEGO1/mxdsstreamingaction.h b/LEGO1/mxdsstreamingaction.h index 942263f9..d50dbed8 100644 --- a/LEGO1/mxdsstreamingaction.h +++ b/LEGO1/mxdsstreamingaction.h @@ -15,6 +15,14 @@ class MxDSStreamingAction : public MxDSAction virtual ~MxDSStreamingAction(); MxDSStreamingAction *CopyFrom(MxDSStreamingAction &p_dsStreamingAction); + MxDSStreamingAction &operator=(MxDSAction &p_dsAction) { + MxDSAction::operator=(p_dsAction); + return *this; + } + MxDSStreamingAction &operator=(MxDSStreamingAction &p_dsStreamingAction) { + MxDSAction::operator=(p_dsStreamingAction); + return *this; + } virtual MxBool HasId(MxU32 p_objectId); // vtable+34;