From c516ceff36227d6b2b99e96fd11b390439bb3a20 Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Wed, 17 Jan 2024 12:04:51 -0500 Subject: [PATCH] Minor style updates/fixes --- LEGO1/lego/legoomni/src/entity/legoentity.cpp | 4 +--- LEGO1/omni/include/mxdsmediaaction.h | 2 +- LEGO1/omni/include/mxdsparallelaction.h | 9 +++++---- LEGO1/omni/src/stream/mxdiskstreamcontroller.cpp | 4 +++- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/LEGO1/lego/legoomni/src/entity/legoentity.cpp b/LEGO1/lego/legoomni/src/entity/legoentity.cpp index b4615704..6e283832 100644 --- a/LEGO1/lego/legoomni/src/entity/legoentity.cpp +++ b/LEGO1/lego/legoomni/src/entity/legoentity.cpp @@ -58,9 +58,7 @@ void LegoEntity::Destroy(MxBool p_fromDestructor) } else { VideoManager()->Get3DManager()->GetLego3DView()->Remove(*m_roi); - - if (m_roi) - delete m_roi; + delete m_roi; } } diff --git a/LEGO1/omni/include/mxdsmediaaction.h b/LEGO1/omni/include/mxdsmediaaction.h index d9174401..7422ec2d 100644 --- a/LEGO1/omni/include/mxdsmediaaction.h +++ b/LEGO1/omni/include/mxdsmediaaction.h @@ -34,7 +34,7 @@ class MxDSMediaAction : public MxDSAction { virtual undefined4 VTable0x14(); // vtable+14; virtual MxU32 GetSizeOnDisk() override; // vtable+18; virtual void Deserialize(MxU8** p_source, MxS16 p_unk0x24) override; // vtable+1c; - virtual MxDSAction* Clone(); // vtable+2c; + virtual MxDSAction* Clone() override; // vtable+2c; void CopyMediaSrcPath(const char* p_mediaSrcPath); diff --git a/LEGO1/omni/include/mxdsparallelaction.h b/LEGO1/omni/include/mxdsparallelaction.h index 3eb70213..0386de7f 100644 --- a/LEGO1/omni/include/mxdsparallelaction.h +++ b/LEGO1/omni/include/mxdsparallelaction.h @@ -13,9 +13,6 @@ class MxDSParallelAction : public MxDSMultiAction { void CopyFrom(MxDSParallelAction& p_dsParallelAction); MxDSParallelAction& operator=(MxDSParallelAction& p_dsParallelAction); - // FUNCTION: LEGO1 0x100caef0 - virtual void SetDuration(MxLong p_duration) override { m_duration = p_duration; } // vtable+0x28 - // FUNCTION: LEGO1 0x100caf00 inline virtual const char* ClassName() const override // vtable+0x0c { @@ -33,7 +30,11 @@ class MxDSParallelAction : public MxDSMultiAction { // MxDSParallelAction::`scalar deleting destructor' virtual MxLong GetDuration() override; // vtable+24; - virtual MxDSAction* Clone() override; // vtable+2c; + + // FUNCTION: LEGO1 0x100caef0 + virtual void SetDuration(MxLong p_duration) override { m_duration = p_duration; } // vtable+0x28 + + virtual MxDSAction* Clone() override; // vtable+2c; }; #endif // MXDSPARALLELACTION_H diff --git a/LEGO1/omni/src/stream/mxdiskstreamcontroller.cpp b/LEGO1/omni/src/stream/mxdiskstreamcontroller.cpp index 9a274733..ba582a9f 100644 --- a/LEGO1/omni/src/stream/mxdiskstreamcontroller.cpp +++ b/LEGO1/omni/src/stream/mxdiskstreamcontroller.cpp @@ -305,10 +305,12 @@ MxResult MxDiskStreamController::VTable0x20(MxDSAction* p_action) void MxDiskStreamController::FUN_100c8120(MxDSAction* p_action) { VTable0x30(p_action); + if (m_provider) { m_provider->VTable0x20(p_action); } - while (true) { + + while (TRUE) { MxDSAction* found = m_unk0x54.Find(p_action, TRUE); if (!found) break;