isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2026-01-28 18:51:16 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Minor style updates/fixes

Browse Source
This commit is contained in:
Christian Semmler 2024-01-17 12:04:51 -05:00
parent b3dc286638
commit c516ceff36
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
LEGO1/lego/legoomni/src/entity/legoentity.cpp
View File

@ -58,9 +58,7 @@ void LegoEntity::Destroy(MxBool p_fromDestructor)
} }
else { else {
VideoManager()->Get3DManager()->GetLego3DView()->Remove(*m_roi); VideoManager()->Get3DManager()->GetLego3DView()->Remove(*m_roi);
delete m_roi;
if (m_roi)
delete m_roi;
} }
} }

2
LEGO1/omni/include/mxdsmediaaction.h
View File

@ -34,7 +34,7 @@ class MxDSMediaAction : public MxDSAction {
virtual undefined4 VTable0x14(); // vtable+14; virtual undefined4 VTable0x14(); // vtable+14;
virtual MxU32 GetSizeOnDisk() override; // vtable+18; virtual MxU32 GetSizeOnDisk() override; // vtable+18;
virtual void Deserialize(MxU8** p_source, MxS16 p_unk0x24) override; // vtable+1c; 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); void CopyMediaSrcPath(const char* p_mediaSrcPath);

9
LEGO1/omni/include/mxdsparallelaction.h
View File

@ -13,9 +13,6 @@ class MxDSParallelAction : public MxDSMultiAction {
void CopyFrom(MxDSParallelAction& p_dsParallelAction); void CopyFrom(MxDSParallelAction& p_dsParallelAction);
MxDSParallelAction& operator=(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 // FUNCTION: LEGO1 0x100caf00
inline virtual const char* ClassName() const override // vtable+0x0c inline virtual const char* ClassName() const override // vtable+0x0c
{ {
@ -33,7 +30,11 @@ class MxDSParallelAction : public MxDSMultiAction {
// MxDSParallelAction::`scalar deleting destructor' // MxDSParallelAction::`scalar deleting destructor'
virtual MxLong GetDuration() override; // vtable+24; 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 #endif // MXDSPARALLELACTION_H

4
LEGO1/omni/src/stream/mxdiskstreamcontroller.cpp
View File

@ -305,10 +305,12 @@ MxResult MxDiskStreamController::VTable0x20(MxDSAction* p_action)
void MxDiskStreamController::FUN_100c8120(MxDSAction* p_action) void MxDiskStreamController::FUN_100c8120(MxDSAction* p_action)
{ {
VTable0x30(p_action); VTable0x30(p_action);
if (m_provider) { if (m_provider) {
m_provider->VTable0x20(p_action); m_provider->VTable0x20(p_action);
} }
while (true) {
while (TRUE) {
MxDSAction* found = m_unk0x54.Find(p_action, TRUE); MxDSAction* found = m_unk0x54.Find(p_action, TRUE);
if (!found) if (!found)
break; break;