mirrors/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2025-10-25 09:24:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add initial .clang-tidy and fixes

Browse Source
This commit is contained in:
Christian Semmler
2024-01-31 02:16:17 -05:00
parent 9e0b19856c
commit 99c16d1392
306 changed files with 2780 additions and 1958 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
LEGO1/omni/include/mxactionnotificationparam.h
View File

@@ -21,8 +21,9 @@ public:
MxDSAction* oldAction = p_action;
this->m_realloc = p_reallocAction;
if (p_reallocAction)
if (p_reallocAction) {
this->m_action = new MxDSAction();
}
else {
this->m_action = oldAction;
return;
@@ -34,17 +35,19 @@ public:
}
// FUNCTION: LEGO1 0x10051050
inline virtual ~MxActionNotificationParam() override
inline ~MxActionNotificationParam() override
{
if (!this->m_realloc)
if (!this->m_realloc) {
return;
}
if (this->m_action)
if (this->m_action) {
delete this->m_action;
}
}
// FUNCTION: LEGO1 0x100510c0
virtual MxNotificationParam* Clone() override
MxNotificationParam* Clone() override
{
return new MxActionNotificationParam(this->m_type, this->m_sender, this->m_action, this->m_realloc);
} // vtable+0x04
@@ -70,7 +73,7 @@ public:
{
}
virtual MxNotificationParam* Clone() override; // vtable+0x04
MxNotificationParam* Clone() override; // vtable+0x04
};
// VTABLE: LEGO1 0x100d8358
@@ -88,7 +91,7 @@ public:
}
// FUNCTION: LEGO1 0x10051270
virtual MxNotificationParam* Clone() override
MxNotificationParam* Clone() override
{
return new MxEndActionNotificationParam(
c_notificationEndAction,
@@ -109,7 +112,7 @@ public:
m_unk0x14 = p_unk0x14;
}
virtual MxNotificationParam* Clone() override; // vtable+0x04
MxNotificationParam* Clone() override; // vtable+0x04
private:
MxPresenter* m_unk0x14; // 0x14

6
LEGO1/omni/include/mxaudiomanager.h
View File

@@ -9,10 +9,10 @@
class MxAudioManager : public MxMediaManager {
public:
MxAudioManager();
virtual ~MxAudioManager() override;
~MxAudioManager() override;
virtual MxResult InitPresenters() override; // vtable+14
virtual void Destroy() override; // vtable+18
MxResult InitPresenters() override; // vtable+14
void Destroy() override; // vtable+18
// FUNCTION: LEGO1 0x10029910
virtual MxS32 GetVolume() { return this->m_volume; } // vtable+28

4
LEGO1/omni/include/mxaudiopresenter.h
View File

@@ -11,14 +11,14 @@ public:
MxAudioPresenter() { m_volume = 100; }
// FUNCTION: LEGO1 0x1000d280
inline virtual const char* ClassName() const override // vtable+0x0c
inline const char* ClassName() const override // vtable+0x0c
{
// STRING: LEGO1 0x100f078c
return "MxAudioPresenter";
}
// FUNCTION: LEGO1 0x1000d290
inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
inline MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, MxAudioPresenter::ClassName()) || MxMediaPresenter::IsA(p_name);
}

23
LEGO1/omni/include/mxbitmap.h
View File

@@ -35,7 +35,7 @@ struct MxBITMAPINFO {
class MxBitmap : public MxCore {
public:
MxBitmap();
virtual ~MxBitmap(); // vtable+00
~MxBitmap() override; // vtable+00
virtual MxResult ImportBitmap(MxBitmap* p_bitmap); // vtable+14
virtual MxResult ImportBitmapInfo(MxBITMAPINFO* p_info); // vtable+18
@@ -102,30 +102,37 @@ public:
}
inline MxLong GetAdjustedStride()
{
if (m_bmiHeader->biCompression == BI_RGB_TOPDOWN || m_bmiHeader->biHeight < 0)
if (m_bmiHeader->biCompression == BI_RGB_TOPDOWN || m_bmiHeader->biHeight < 0) {
return GetBmiStride();
else
}
else {
return -GetBmiStride();
}
}
inline MxLong GetLine(MxS32 p_top)
{
MxS32 height;
if (m_bmiHeader->biCompression == BI_RGB_TOPDOWN || m_bmiHeader->biHeight < 0)
if (m_bmiHeader->biCompression == BI_RGB_TOPDOWN || m_bmiHeader->biHeight < 0) {
height = p_top;
else
}
else {
height = GetBmiHeightAbs() - p_top - 1;
}
return GetBmiStride() * height;
}
inline MxU8* GetStart(MxS32 p_left, MxS32 p_top)
{
if (m_bmiHeader->biCompression == BI_RGB)
if (m_bmiHeader->biCompression == BI_RGB) {
return GetLine(p_top) + m_data + p_left;
else if (m_bmiHeader->biCompression == BI_RGB_TOPDOWN)
}
else if (m_bmiHeader->biCompression == BI_RGB_TOPDOWN) {
return m_data;
else
}
else {
return GetLine(0) + m_data;
}
}
// SYNTHETIC: LEGO1 0x100bc9f0

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

@@ -16,7 +16,7 @@ public:
void SetDestroy(void (*p_customDestructor)(T)) { this->m_customDestructor = p_customDestructor; }
virtual ~MxCollection() {}
~MxCollection() override {}
virtual MxS8 Compare(T, T) { return 0; }
protected:

27
LEGO1/omni/include/mxcompositepresenter.h
View File

@@ -12,37 +12,38 @@ class MxCompositePresenterList : public list<MxPresenter*> {};
class MxCompositePresenter : public MxPresenter {
public:
MxCompositePresenter();
virtual ~MxCompositePresenter() override; // vtable+0x00
~MxCompositePresenter() override; // vtable+0x00
virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
MxLong Notify(MxParam& p_param) override; // vtable+0x04
// FUNCTION: LEGO1 0x100b6210
inline virtual const char* ClassName() const override // vtable+0x0c
inline const char* ClassName() const override // vtable+0x0c
{
// STRING: LEGO1 0x100f0774
return "MxCompositePresenter";
}
// FUNCTION: LEGO1 0x100b6220
inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
inline MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, MxCompositePresenter::ClassName()) || MxPresenter::IsA(p_name);
}
virtual MxResult StartAction(MxStreamController* p_controller, MxDSAction* p_action) override; // vtable+0x3c
virtual void EndAction() override; // vtable+0x40
virtual void SetTickleState(TickleState p_tickleState) override; // vtable+0x44
virtual MxBool HasTickleStatePassed(TickleState p_tickleState) override; // vtable+0x48
virtual void Enable(MxBool p_enable) override; // vtable+0x54
virtual void VTable0x58(MxEndActionNotificationParam& p_param); // vtable+0x58
virtual void VTable0x5c(MxNotificationParam& p_param); // vtable+0x5c
virtual void VTable0x60(MxPresenter* p_presenter); // vtable+0x60
MxResult StartAction(MxStreamController* p_controller, MxDSAction* p_action) override; // vtable+0x3c
void EndAction() override; // vtable+0x40
void SetTickleState(TickleState p_tickleState) override; // vtable+0x44
MxBool HasTickleStatePassed(TickleState p_tickleState) override; // vtable+0x48
void Enable(MxBool p_enable) override; // vtable+0x54
virtual void VTable0x58(MxEndActionNotificationParam& p_param); // vtable+0x58
virtual void VTable0x5c(MxNotificationParam& p_param); // vtable+0x5c
virtual void VTable0x60(MxPresenter* p_presenter); // vtable+0x60
// FUNCTION: LEGO1 0x1000caf0
virtual MxBool VTable0x64(undefined4 p_undefined)
{
if (m_compositePresenter)
if (m_compositePresenter) {
return m_compositePresenter->VTable0x64(p_undefined);
}
return TRUE;
} // vtable+0x64

22
LEGO1/omni/include/mxdiskstreamcontroller.h
View File

@@ -15,30 +15,30 @@
class MxDiskStreamController : public MxStreamController {
public:
MxDiskStreamController();
virtual ~MxDiskStreamController() override;
~MxDiskStreamController() override;
virtual MxResult Tickle() override; // vtable+0x08
MxResult Tickle() override; // vtable+0x08
// FUNCTION: LEGO1 0x100c7360
inline virtual const char* ClassName() const override // vtable+0x0c
inline const char* ClassName() const override // vtable+0x0c
{
// STRING: LEGO1 0x10102144
return "MxDiskStreamController";
}
// FUNCTION: LEGO1 0x100c7370
inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
inline MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, MxDiskStreamController::ClassName()) || MxStreamController::IsA(p_name);
}
virtual MxResult Open(const char* p_filename) override; // vtable+0x14
virtual MxResult VTable0x18(undefined4, undefined4) override; // vtable+0x18
virtual MxResult VTable0x20(MxDSAction* p_action) override; // vtable+0x20
virtual MxResult VTable0x24(MxDSAction* p_action) override; // vtable+0x24
virtual MxDSStreamingAction* VTable0x28() override; // vtable+0x28
virtual MxResult VTable0x30(MxDSAction* p_action) override; // vtable+0x30
virtual MxResult VTable0x34(undefined4); // vtable+0x34
MxResult Open(const char* p_filename) override; // vtable+0x14
MxResult VTable0x18(undefined4, undefined4) override; // vtable+0x18
MxResult VTable0x20(MxDSAction* p_action) override; // vtable+0x20
MxResult VTable0x24(MxDSAction* p_action) override; // vtable+0x24
MxDSStreamingAction* VTable0x28() override; // vtable+0x28
MxResult VTable0x30(MxDSAction* p_action) override; // vtable+0x30
virtual MxResult VTable0x34(undefined4); // vtable+0x34
inline MxBool GetUnk0xc4() const { return m_unk0xc4; }

18
LEGO1/omni/include/mxdiskstreamprovider.h
View File

@@ -27,17 +27,17 @@ public:
class MxDiskStreamProvider : public MxStreamProvider {
public:
MxDiskStreamProvider();
virtual ~MxDiskStreamProvider() override;
~MxDiskStreamProvider() override;
// FUNCTION: LEGO1 0x100d1160
inline virtual const char* ClassName() const override // vtable+0x0c
inline const char* ClassName() const override // vtable+0x0c
{
// STRING: LEGO1 0x1010287c
return "MxDiskStreamProvider";
}
// FUNCTION: LEGO1 0x100d1170
inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
inline MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, MxDiskStreamProvider::ClassName()) || MxStreamProvider::IsA(p_name);
}
@@ -48,12 +48,12 @@ public:
static MxBool FUN_100d1af0(MxDSStreamingAction* p_action);
MxResult FUN_100d1b20(MxDSStreamingAction* p_action);
virtual MxResult SetResourceToGet(MxStreamController* p_resource) override; // vtable+0x14
virtual MxU32 GetFileSize() override; // vtable+0x18
virtual MxS32 GetStreamBuffersNum() override; // vtable+0x1c
virtual void VTable0x20(MxDSAction* p_action) override; // vtable+0x20
virtual MxU32 GetLengthInDWords() override; // vtable+0x24
virtual MxU32* GetBufferForDWords() override; // vtable+0x28
MxResult SetResourceToGet(MxStreamController* p_resource) override; // vtable+0x14
MxU32 GetFileSize() override; // vtable+0x18
MxS32 GetStreamBuffersNum() override; // vtable+0x1c
void VTable0x20(MxDSAction* p_action) override; // vtable+0x20
MxU32 GetLengthInDWords() override; // vtable+0x24
MxU32* GetBufferForDWords() override; // vtable+0x28
private:
MxDiskStreamProviderThread m_thread; // 0x10

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

@@ -14,7 +14,7 @@
class MxDisplaySurface : public MxCore {
public:
MxDisplaySurface();
virtual ~MxDisplaySurface() override;
~MxDisplaySurface() override;
virtual MxResult Init(
MxVideoParam& p_videoParam,

34
LEGO1/omni/include/mxdsaction.h
View File

@@ -25,35 +25,35 @@ public:
};
MxDSAction();
virtual ~MxDSAction();
~MxDSAction() override;
void CopyFrom(MxDSAction& p_dsAction);
MxDSAction& operator=(MxDSAction& p_dsAction);
// FUNCTION: LEGO1 0x100ad980
inline virtual const char* ClassName() const override // vtable+0x0c
inline const char* ClassName() const override // vtable+0x0c
{
// STRING: LEGO1 0x101013f4
return "MxDSAction";
}
// FUNCTION: LEGO1 0x100ad990
inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
inline MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, MxDSAction::ClassName()) || MxDSObject::IsA(p_name);
}
virtual undefined4 VTable0x14() override; // vtable+14;
virtual MxU32 GetSizeOnDisk() override; // vtable+18;
virtual void Deserialize(MxU8** p_source, MxS16 p_unk0x24) override; // vtable+1c;
virtual MxLong GetDuration(); // vtable+24;
virtual void SetDuration(MxLong p_duration); // vtable+28;
virtual MxDSAction* Clone(); // vtable+2c;
virtual void MergeFrom(MxDSAction& p_dsAction); // vtable+30;
virtual MxBool HasId(MxU32 p_objectId); // vtable+34;
virtual void SetUnknown90(MxLong p_unk0x90); // vtable+38;
virtual MxLong GetUnknown90(); // vtable+3c;
virtual MxLong GetElapsedTime(); // vtable+40;
undefined4 VTable0x14() override; // vtable+14;
MxU32 GetSizeOnDisk() override; // vtable+18;
void Deserialize(MxU8** p_source, MxS16 p_unk0x24) override; // vtable+1c;
virtual MxLong GetDuration(); // vtable+24;
virtual void SetDuration(MxLong p_duration); // vtable+28;
virtual MxDSAction* Clone(); // vtable+2c;
virtual void MergeFrom(MxDSAction& p_dsAction); // vtable+30;
virtual MxBool HasId(MxU32 p_objectId); // vtable+34;
virtual void SetUnknown90(MxLong p_unk0x90); // vtable+38;
virtual MxLong GetUnknown90(); // vtable+3c;
virtual MxLong GetElapsedTime(); // vtable+40;
void AppendData(MxU16 p_extraLength, const char* p_extraData);
@@ -77,10 +77,12 @@ public:
inline void CopyFlags(MxU32 p_flags)
{
if (p_flags & MxDSAction::c_looping)
if (p_flags & MxDSAction::c_looping) {
SetFlags(GetFlags() | MxDSAction::c_looping);
else if (p_flags & MxDSAction::c_bit3)
}
else if (p_flags & MxDSAction::c_bit3) {
SetFlags(GetFlags() | MxDSAction::c_bit3);
}
}
// SYNTHETIC: LEGO1 0x100ada60

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

@@ -19,7 +19,7 @@ public:
MxDSActionList() { this->m_unk0x18 = 0; }
// FUNCTION: LEGO1 0x100c9c90
virtual MxS8 Compare(MxDSAction* p_a, MxDSAction* p_b) override
MxS8 Compare(MxDSAction* p_a, MxDSAction* p_b) override
{
return p_a == p_b ? 0 : p_a < p_b ? -1 : 1;
} // vtable+0x14

8
LEGO1/omni/include/mxdsanim.h
View File

@@ -8,25 +8,25 @@
class MxDSAnim : public MxDSMediaAction {
public:
MxDSAnim();
virtual ~MxDSAnim() override;
~MxDSAnim() override;
void CopyFrom(MxDSAnim& p_dsAnim);
MxDSAnim& operator=(MxDSAnim& p_dsAnim);
// FUNCTION: LEGO1 0x100c9060
inline virtual const char* ClassName() const override // vtable+0x0c
inline const char* ClassName() const override // vtable+0x0c
{
// STRING: LEGO1 0x101025d8
return "MxDSAnim";
}
// FUNCTION: LEGO1 0x100c9070
inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
inline MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, MxDSAnim::ClassName()) || MxDSMediaAction::IsA(p_name);
}
virtual MxDSAction* Clone() override; // vtable+2c;
MxDSAction* Clone() override; // vtable+2c;
// SYNTHETIC: LEGO1 0x100c9180
// MxDSAnim::`scalar deleting destructor'

4
LEGO1/omni/include/mxdsbuffer.h
View File

@@ -22,10 +22,10 @@ public:
};
MxDSBuffer();
virtual ~MxDSBuffer() override;
~MxDSBuffer() override;
// FUNCTION: LEGO1 0x100c6500
inline virtual const char* ClassName() const override // vtable+0x0c
inline const char* ClassName() const override // vtable+0x0c
{
// STRING: LEGO1 0x101025b8
return "MxDSBuffer";

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

@@ -18,17 +18,17 @@ public:
};
MxDSChunk();
virtual ~MxDSChunk() override;
~MxDSChunk() override;
// FUNCTION: LEGO1 0x100be0c0
inline virtual const char* ClassName() const override // vtable+0x0c
inline const char* ClassName() const override // vtable+0x0c
{
// STRING: LEGO1 0x10101e6c
return "MxDSChunk";
}
// FUNCTION: LEGO1 0x100be0d0
inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
inline MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, MxDSChunk::ClassName()) || MxCore::IsA(p_name);
}
@@ -53,8 +53,9 @@ public:
inline void Release()
{
if (m_data)
if (m_data) {
delete[] m_data;
}
}
// SYNTHETIC: LEGO1 0x100be150

8
LEGO1/omni/include/mxdsevent.h
View File

@@ -7,25 +7,25 @@
class MxDSEvent : public MxDSMediaAction {
public:
MxDSEvent();
virtual ~MxDSEvent() override;
~MxDSEvent() override;
void CopyFrom(MxDSEvent& p_dsEvent);
MxDSEvent& operator=(MxDSEvent& p_dsEvent);
// FUNCTION: LEGO1 0x100c9660
inline virtual const char* ClassName() const override // vtable+0x0c
inline const char* ClassName() const override // vtable+0x0c
{
// STRING: LEGO1 0x101025f0
return "MxDSEvent";
}
// FUNCTION: LEGO1 0x100c9670
inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
inline MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, MxDSEvent::ClassName()) || MxDSMediaAction::IsA(p_name);
}
virtual MxDSAction* Clone() override; // vtable+2c;
MxDSAction* Clone() override; // vtable+2c;
// SYNTHETIC: LEGO1 0x100c9780
// MxDSEvent::`scalar deleting destructor'

18
LEGO1/omni/include/mxdsfile.h
View File

@@ -12,27 +12,27 @@
class MxDSFile : public MxDSSource {
public:
MxDSFile(const char* p_filename, MxULong p_skipReadingChunks);
virtual ~MxDSFile(); // vtable+0x00
~MxDSFile() override; // vtable+0x00
// FUNCTION: LEGO1 0x100c0120
inline virtual const char* ClassName() const override // vtable+0x0c
inline const char* ClassName() const override // vtable+0x0c
{
// STRING: LEGO1 0x10102594
return "MxDSFile";
}
// FUNCTION: LEGO1 0x100c0130
inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
inline MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, MxDSFile::ClassName()) || MxDSSource::IsA(p_name);
}
virtual MxLong Open(MxULong); // vtable+0x14
virtual MxLong Close(); // vtable+0x18
virtual MxResult Read(unsigned char*, MxULong); // vtable+0x20
virtual MxLong Seek(MxLong, int); // vtable+0x24
virtual MxULong GetBufferSize(); // vtable+0x28
virtual MxULong GetStreamBuffersNum(); // vtable+0x2c
MxLong Open(MxULong) override; // vtable+0x14
MxLong Close() override; // vtable+0x18
MxResult Read(unsigned char*, MxULong) override; // vtable+0x20
MxLong Seek(MxLong, int) override; // vtable+0x24
MxULong GetBufferSize() override; // vtable+0x28
MxULong GetStreamBuffersNum() override; // vtable+0x2c
inline void SetFileName(const char* p_filename) { m_filename = p_filename; }

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

@@ -10,20 +10,20 @@
class MxDSMediaAction : public MxDSAction {
public:
MxDSMediaAction();
virtual ~MxDSMediaAction() override;
~MxDSMediaAction() override;
void CopyFrom(MxDSMediaAction& p_dsMediaAction);
MxDSMediaAction& operator=(MxDSMediaAction& p_dsMediaAction);
// FUNCTION: LEGO1 0x100c8be0
inline virtual const char* ClassName() const override // vtable+0x0c
inline const char* ClassName() const override // vtable+0x0c
{
// STRING: LEGO1 0x100f7624
return "MxDSMediaAction";
}
// FUNCTION: LEGO1 0x100c8bf0
inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
inline MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, MxDSMediaAction::ClassName()) || MxDSAction::IsA(p_name);
}
@@ -31,10 +31,10 @@ public:
// SYNTHETIC: LEGO1 0x100c8cd0
// MxDSMediaAction::`scalar deleting destructor'
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() override; // vtable+2c;
undefined4 VTable0x14() override; // vtable+14;
MxU32 GetSizeOnDisk() override; // vtable+18;
void Deserialize(MxU8** p_source, MxS16 p_unk0x24) override; // vtable+1c;
MxDSAction* Clone() override; // vtable+2c;
void CopyMediaSrcPath(const char* p_mediaSrcPath);

22
LEGO1/omni/include/mxdsmultiaction.h
View File

@@ -9,32 +9,32 @@
class MxDSMultiAction : public MxDSAction {
public:
MxDSMultiAction();
virtual ~MxDSMultiAction() override;
~MxDSMultiAction() override;
void CopyFrom(MxDSMultiAction& p_dsMultiAction);
MxDSMultiAction& operator=(MxDSMultiAction& p_dsMultiAction);
// FUNCTION: LEGO1 0x100c9f50
inline virtual const char* ClassName() const override // vtable+0x0c
inline const char* ClassName() const override // vtable+0x0c
{
// STRING: LEGO1 0x10101dbc
return "MxDSMultiAction";
}
// FUNCTION: LEGO1 0x100c9f60
inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
inline MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, MxDSMultiAction::ClassName()) || MxDSAction::IsA(p_name);
}
virtual undefined4 VTable0x14() override; // vtable+14;
virtual MxU32 GetSizeOnDisk() override; // vtable+18;
virtual void Deserialize(MxU8** p_source, MxS16 p_unk0x24) override; // vtable+1c;
virtual void SetAtomId(MxAtomId p_atomId) override; // vtable+20;
virtual MxDSAction* Clone() override; // vtable+2c;
virtual void MergeFrom(MxDSAction& p_dsAction) override; // vtable+30;
virtual MxBool HasId(MxU32 p_objectId) override; // vtable+34;
virtual void SetUnknown90(MxLong p_unk0x90) override; // vtable+38;
undefined4 VTable0x14() override; // vtable+14;
MxU32 GetSizeOnDisk() override; // vtable+18;
void Deserialize(MxU8** p_source, MxS16 p_unk0x24) override; // vtable+1c;
void SetAtomId(MxAtomId p_atomId) override; // vtable+20;
MxDSAction* Clone() override; // vtable+2c;
void MergeFrom(MxDSAction& p_dsAction) override; // vtable+30;
MxBool HasId(MxU32 p_objectId) override; // vtable+34;
void SetUnknown90(MxLong p_unk0x90) override; // vtable+38;
inline MxDSActionList* GetActionList() const { return m_actions; }

6
LEGO1/omni/include/mxdsobject.h
View File

@@ -27,7 +27,7 @@ public:
};
MxDSObject();
virtual ~MxDSObject() override;
~MxDSObject() override;
void CopyFrom(MxDSObject& p_dsObject);
MxDSObject& operator=(MxDSObject& p_dsObject);
@@ -36,10 +36,10 @@ public:
void SetSourceName(const char* p_sourceName);
// FUNCTION: LEGO1 0x100bf730
inline virtual const char* ClassName() const override { return "MxDSObject"; } // vtable+0c
inline const char* ClassName() const override { return "MxDSObject"; } // vtable+0c
// FUNCTION: LEGO1 0x100bf740
inline virtual MxBool IsA(const char* p_name) const override
inline MxBool IsA(const char* p_name) const override
{
return !strcmp(p_name, MxDSObject::ClassName()) || MxCore::IsA(p_name);
} // vtable+10;

8
LEGO1/omni/include/mxdsobjectaction.h
View File

@@ -8,24 +8,24 @@
class MxDSObjectAction : public MxDSMediaAction {
public:
MxDSObjectAction();
virtual ~MxDSObjectAction() override;
~MxDSObjectAction() override;
MxDSObjectAction& operator=(MxDSObjectAction& p_dsObjectAction);
// FUNCTION: LEGO1 0x100c88e0
inline virtual const char* ClassName() const override // vtable+0x0c
inline const char* ClassName() const override // vtable+0x0c
{
// STRING: LEGO1 0x101025c4
return "MxDSObjectAction";
}
// FUNCTION: LEGO1 0x100c88f0
inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
inline MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, MxDSObjectAction::ClassName()) || MxDSMediaAction::IsA(p_name);
}
virtual MxDSAction* Clone() override; // vtable+2c;
MxDSAction* Clone() override; // vtable+2c;
virtual void CopyFrom(MxDSObjectAction& p_dsObjectAction); // vtable+44;
// SYNTHETIC: LEGO1 0x100c8a00

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

@@ -8,20 +8,20 @@
class MxDSParallelAction : public MxDSMultiAction {
public:
MxDSParallelAction();
virtual ~MxDSParallelAction() override;
~MxDSParallelAction() override;
void CopyFrom(MxDSParallelAction& p_dsParallelAction);
MxDSParallelAction& operator=(MxDSParallelAction& p_dsParallelAction);
// FUNCTION: LEGO1 0x100caf00
inline virtual const char* ClassName() const override // vtable+0x0c
inline const char* ClassName() const override // vtable+0x0c
{
// STRING: LEGO1 0x10102608
return "MxDSParallelAction";
}
// FUNCTION: LEGO1 0x100caf10
inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
inline MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, MxDSParallelAction::ClassName()) || MxDSMultiAction::IsA(p_name);
}
@@ -29,12 +29,12 @@ public:
// SYNTHETIC: LEGO1 0x100cb020
// MxDSParallelAction::`scalar deleting destructor'
virtual MxLong GetDuration() override; // vtable+24;
MxLong GetDuration() override; // vtable+24;
// FUNCTION: LEGO1 0x100caef0
virtual void SetDuration(MxLong p_duration) override { m_duration = p_duration; } // vtable+0x28
void SetDuration(MxLong p_duration) override { m_duration = p_duration; } // vtable+0x28
virtual MxDSAction* Clone() override; // vtable+2c;
MxDSAction* Clone() override; // vtable+2c;
};
#endif // MXDSPARALLELACTION_H

12
LEGO1/omni/include/mxdsselectaction.h
View File

@@ -10,27 +10,27 @@
class MxDSSelectAction : public MxDSParallelAction {
public:
MxDSSelectAction();
virtual ~MxDSSelectAction() override;
~MxDSSelectAction() override;
void CopyFrom(MxDSSelectAction& p_dsSelectAction);
MxDSSelectAction& operator=(MxDSSelectAction& p_dsSelectAction);
// FUNCTION: LEGO1 0x100cb6f0
inline virtual const char* ClassName() const override // vtable+0x0c
inline const char* ClassName() const override // vtable+0x0c
{
// STRING: LEGO1 0x1010261c
return "MxDSSelectAction";
}
// FUNCTION: LEGO1 0x100cb700
inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
inline MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, MxDSSelectAction::ClassName()) || MxDSParallelAction::IsA(p_name);
}
virtual MxU32 GetSizeOnDisk() override; // vtable+18;
virtual void Deserialize(MxU8** p_source, MxS16 p_unk0x24) override; // vtable+1c;
virtual MxDSAction* Clone() override; // vtable+2c;
MxU32 GetSizeOnDisk() override; // vtable+18;
void Deserialize(MxU8** p_source, MxS16 p_unk0x24) override; // vtable+1c;
MxDSAction* Clone() override; // vtable+2c;
// SYNTHETIC: LEGO1 0x100cb840
// MxDSSelectAction::`scalar deleting destructor'

12
LEGO1/omni/include/mxdsserialaction.h
View File

@@ -9,27 +9,27 @@
class MxDSSerialAction : public MxDSMultiAction {
public:
MxDSSerialAction();
virtual ~MxDSSerialAction() override;
~MxDSSerialAction() override;
void CopyFrom(MxDSSerialAction& p_dsSerialAction);
MxDSSerialAction& operator=(MxDSSerialAction& p_dsSerialAction);
// FUNCTION: LEGO1 0x100caad0
inline virtual const char* ClassName() const override // vtable+0x0c
inline const char* ClassName() const override // vtable+0x0c
{
// STRING: LEGO1 0x100f75dc
return "MxDSSerialAction";
}
// FUNCTION: LEGO1 0x100caae0
inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
inline MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, MxDSSerialAction::ClassName()) || MxDSMultiAction::IsA(p_name);
}
virtual MxLong GetDuration() override; // vtable+24;
virtual void SetDuration(MxLong p_duration) override; // vtable+28;
virtual MxDSAction* Clone() override; // vtable+2c;
MxLong GetDuration() override; // vtable+24;
void SetDuration(MxLong p_duration) override; // vtable+28;
MxDSAction* Clone() override; // vtable+2c;
// SYNTHETIC: LEGO1 0x100cabf0
// MxDSSerialAction::`scalar deleting destructor'

12
LEGO1/omni/include/mxdssound.h
View File

@@ -8,27 +8,27 @@
class MxDSSound : public MxDSMediaAction {
public:
MxDSSound();
virtual ~MxDSSound() override;
~MxDSSound() override;
void CopyFrom(MxDSSound& p_dsSound);
MxDSSound& operator=(MxDSSound& p_dsSound);
// FUNCTION: LEGO1 0x100c9330
inline virtual const char* ClassName() const override // vtable+0x0c
inline const char* ClassName() const override // vtable+0x0c
{
// STRING: LEGO1 0x101025e4
return "MxDSSound";
}
// FUNCTION: LEGO1 0x100c9340
inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
inline MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, MxDSSound::ClassName()) || MxDSMediaAction::IsA(p_name);
}
virtual MxU32 GetSizeOnDisk() override; // vtable+18;
virtual void Deserialize(MxU8** p_source, MxS16 p_unk0x24) override; // vtable+1c;
virtual MxDSAction* Clone() override; // vtable+2c;
MxU32 GetSizeOnDisk() override; // vtable+18;
void Deserialize(MxU8** p_source, MxS16 p_unk0x24) override; // vtable+1c;
MxDSAction* Clone() override; // vtable+2c;
inline MxS32 GetVolume() const { return m_volume; }

6
LEGO1/omni/include/mxdssource.h
View File

@@ -12,17 +12,17 @@ public:
MxDSSource() : m_lengthInDWords(0), m_pBuffer(NULL), m_position(-1) {}
// FUNCTION: LEGO1 0x100bff60
virtual ~MxDSSource() override { delete[] m_pBuffer; }
~MxDSSource() override { delete[] m_pBuffer; }
// FUNCTION: LEGO1 0x100c0010
inline virtual const char* ClassName() const override // vtable+0x0c
inline const char* ClassName() const override // vtable+0x0c
{
// STRING: LEGO1 0x10102588
return "MxDSSource";
}
// FUNCTION: LEGO1 0x100c0020
inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
inline MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, MxDSSource::ClassName()) || MxCore::IsA(p_name);
}

8
LEGO1/omni/include/mxdsstill.h
View File

@@ -8,25 +8,25 @@
class MxDSStill : public MxDSMediaAction {
public:
MxDSStill();
virtual ~MxDSStill() override;
~MxDSStill() override;
void CopyFrom(MxDSStill& p_dsStill);
MxDSStill& operator=(MxDSStill& p_dsStill);
// FUNCTION: LEGO1 0x100c9930
inline virtual const char* ClassName() const override // vtable+0x0c
inline const char* ClassName() const override // vtable+0x0c
{
// STRING: LEGO1 0x101025fc
return "MxDSStill";
}
// FUNCTION: LEGO1 0x100c9940
inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
inline MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, MxDSStill::ClassName()) || MxDSMediaAction::IsA(p_name);
}
virtual MxDSAction* Clone() override; // vtable+2c;
MxDSAction* Clone() override; // vtable+2c;
// SYNTHETIC: LEGO1 0x100c9a50
// MxDSStill::`scalar deleting destructor'

4
LEGO1/omni/include/mxdsstreamingaction.h
View File

@@ -11,7 +11,7 @@ class MxDSStreamingAction : public MxDSAction {
public:
MxDSStreamingAction(MxDSAction& p_dsAction, MxU32 p_offset);
MxDSStreamingAction(MxDSStreamingAction& p_dsStreamingAction);
virtual ~MxDSStreamingAction();
~MxDSStreamingAction() override;
MxDSStreamingAction* CopyFrom(MxDSStreamingAction& p_dsStreamingAction);
MxDSStreamingAction& operator=(MxDSAction& p_dsAction)
@@ -25,7 +25,7 @@ public:
return *this;
}
virtual MxBool HasId(MxU32 p_objectId) override; // vtable+34;
MxBool HasId(MxU32 p_objectId) override; // vtable+34;
MxResult Init();
void SetInternalAction(MxDSAction* p_dsAction);

6
LEGO1/omni/include/mxdssubscriber.h
View File

@@ -14,17 +14,17 @@ class MxStreamController;
class MxDSSubscriber : public MxCore {
public:
MxDSSubscriber();
virtual ~MxDSSubscriber() override;
~MxDSSubscriber() override;
// FUNCTION: LEGO1 0x100b7d50
inline virtual const char* ClassName() const override // vtable+0x0c
inline const char* ClassName() const override // vtable+0x0c
{
// STRING: LEGO1 0x101020f8
return "MxDSSubscriber";
}
// FUNCTION: LEGO1 0x100b7d60
inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
inline MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, MxDSSubscriber::ClassName()) || MxCore::IsA(p_name);
}

6
LEGO1/omni/include/mxentity.h
View File

@@ -15,17 +15,17 @@ public:
MxEntity() { this->m_mxEntityId = -1; }
// FUNCTION: LEGO1 0x1000c110
virtual ~MxEntity() override{};
~MxEntity() override{};
// FUNCTION: LEGO1 0x1000c180
inline virtual const char* ClassName() const override // vtable+0x0c
inline const char* ClassName() const override // vtable+0x0c
{
// STRING: LEGO1 0x100f0070
return "MxEntity";
}
// FUNCTION: LEGO1 0x1000c190
inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
inline MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, MxEntity::ClassName()) || MxCore::IsA(p_name);
}

4
LEGO1/omni/include/mxeventmanager.h
View File

@@ -9,9 +9,9 @@
class MxEventManager : public MxMediaManager {
public:
MxEventManager();
virtual ~MxEventManager() override;
~MxEventManager() override;
virtual void Destroy() override; // vtable+18
void Destroy() override; // vtable+18
virtual MxResult Create(MxU32 p_frequencyMS, MxBool p_createThread); // vtable+28
// SYNTHETIC: LEGO1 0x100c03d0

16
LEGO1/omni/include/mxeventpresenter.h
View File

@@ -9,26 +9,26 @@
class MxEventPresenter : public MxMediaPresenter {
public:
MxEventPresenter();
virtual ~MxEventPresenter() override;
~MxEventPresenter() override;
// FUNCTION: LEGO1 0x100c2c30
inline virtual const char* ClassName() const override // vtable+0x0c
inline const char* ClassName() const override // vtable+0x0c
{
// STRING: LEGO1 0x10101dcc
return "MxEventPresenter";
}
// FUNCTION: LEGO1 0x100c2c40
inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
inline MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, MxEventPresenter::ClassName()) || MxMediaPresenter::IsA(p_name);
}
virtual void ReadyTickle() override; // vtable+0x18
virtual void StartingTickle() override; // vtable+0x1c
virtual MxResult AddToManager() override; // vtable+0x34
virtual void Destroy() override; // vtable+0x38
virtual MxResult PutData() override; // vtable+0x4c
void ReadyTickle() override; // vtable+0x18
void StartingTickle() override; // vtable+0x1c
MxResult AddToManager() override; // vtable+0x34
void Destroy() override; // vtable+0x38
MxResult PutData() override; // vtable+0x4c
virtual void CopyData(MxStreamChunk* p_chunk); // vtable+0x5c
// SYNTHETIC: LEGO1 0x100c2d20

14
LEGO1/omni/include/mxflcpresenter.h
View File

@@ -11,25 +11,25 @@
class MxFlcPresenter : public MxVideoPresenter {
public:
MxFlcPresenter();
virtual ~MxFlcPresenter() override;
~MxFlcPresenter() override;
// FUNCTION: LEGO1 0x1004e200
inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
inline MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, MxFlcPresenter::ClassName()) || MxVideoPresenter::IsA(p_name);
}
// FUNCTION: LEGO1 0x100b33f0
inline virtual const char* ClassName() const override // vtable+0x0c
inline const char* ClassName() const override // vtable+0x0c
{
// STRING: LEGO1 0x100f43c8
return "MxFlcPresenter";
}
virtual void LoadHeader(MxStreamChunk* p_chunk) override; // vtable+0x5c
virtual void CreateBitmap() override; // vtable+0x60
virtual void LoadFrame(MxStreamChunk* p_chunk) override; // vtable+0x68
virtual void RealizePalette() override; // vtable+0x70
void LoadHeader(MxStreamChunk* p_chunk) override; // vtable+0x5c
void CreateBitmap() override; // vtable+0x60
void LoadFrame(MxStreamChunk* p_chunk) override; // vtable+0x68
void RealizePalette() override; // vtable+0x70
// SYNTHETIC: LEGO1 0x100b3400
// MxFlcPresenter::`scalar deleting destructor'

17
LEGO1/omni/include/mxhashtable.h
View File

@@ -46,7 +46,7 @@ public:
m_resizeOption = e_noExpand;
}
virtual ~MxHashTable() override;
~MxHashTable() override;
void Resize();
void Add(T);
@@ -99,8 +99,9 @@ MxBool MxHashTableCursor<T>::Find(T p_obj)
MxHashTableNode<T>* t = m_table->m_slots[bucket];
while (t) {
if (t->m_hash == hash && !m_table->Compare(t->m_obj, p_obj))
if (t->m_hash == hash && !m_table->Compare(t->m_obj, p_obj)) {
m_match = t;
}
t = t->m_next;
}
@@ -122,8 +123,9 @@ void MxHashTableCursor<T>::DeleteMatch()
{
// Cut the matching node out of the linked list
// by updating pointer references.
if (m_match == NULL)
if (m_match == NULL) {
return;
}
if (m_match->m_prev) {
m_match->m_prev->m_next = m_match->m_next;
@@ -134,8 +136,9 @@ void MxHashTableCursor<T>::DeleteMatch()
m_table->m_slots[bucket] = m_match->m_next;
}
if (m_match->m_next)
if (m_match->m_next) {
m_match->m_next->m_prev = m_match->m_prev;
}
m_table->m_customDestructor(m_match->m_obj);
delete m_match;
@@ -210,8 +213,9 @@ inline void MxHashTable<T>::NodeInsert(MxHashTableNode<T>* p_node)
p_node->m_next = m_slots[bucket];
if (m_slots[bucket])
if (m_slots[bucket]) {
m_slots[bucket]->m_prev = p_node;
}
m_slots[bucket] = p_node;
this->m_count++;
@@ -220,8 +224,9 @@ inline void MxHashTable<T>::NodeInsert(MxHashTableNode<T>* p_node)
template <class T>
inline void MxHashTable<T>::Add(T p_newobj)
{
if (m_resizeOption && ((this->m_count + 1) / m_numSlots) > m_autoResizeRatio)
if (m_resizeOption && ((this->m_count + 1) / m_numSlots) > m_autoResizeRatio) {
MxHashTable<T>::Resize();
}
MxU32 hash = Hash(p_newobj);
MxHashTableNode<T>* node = new MxHashTableNode<T>(p_newobj, hash);

83
LEGO1/omni/include/mxlist.h
View File

@@ -51,7 +51,7 @@ public:
m_first = NULL;
}
virtual ~MxList() override;
~MxList() override;
void Append(T p_obj) { InsertEntry(p_obj, this->m_last, NULL); }
void Prepend(T p_obj) { InsertEntry(p_obj, NULL, this->m_first); }
@@ -121,8 +121,9 @@ public:
// TODO: Probably shouldn't exist
void NextFragment()
{
if (m_match)
if (m_match) {
m_match = m_match->GetNext();
}
}
private:
@@ -147,13 +148,15 @@ template <class T>
inline void MxList<T>::DeleteAll(MxBool p_destroy)
{
for (MxListEntry<T>* t = m_first;;) {
if (!t)
if (!t) {
break;
}
MxListEntry<T>* next = t->GetNext();
if (p_destroy)
if (p_destroy) {
this->m_customDestructor(t->GetValue());
}
delete t;
t = next;
@@ -169,15 +172,19 @@ inline MxListEntry<T>* MxList<T>::InsertEntry(T p_newobj, MxListEntry<T>* p_prev
{
MxListEntry<T>* newEntry = new MxListEntry<T>(p_newobj, p_prev, p_next);
if (p_prev)
if (p_prev) {
p_prev->SetNext(newEntry);
else
}
else {
this->m_first = newEntry;
}
if (p_next)
if (p_next) {
p_next->SetPrev(newEntry);
else
}
else {
this->m_last = newEntry;
}
this->m_count++;
return newEntry;
@@ -186,15 +193,19 @@ inline MxListEntry<T>* MxList<T>::InsertEntry(T p_newobj, MxListEntry<T>* p_prev
template <class T>
inline void MxList<T>::DeleteEntry(MxListEntry<T>* p_match)
{
if (p_match->GetPrev())
if (p_match->GetPrev()) {
p_match->GetPrev()->SetNext(p_match->GetNext());
else
}
else {
m_first = p_match->GetNext();
}
if (p_match->GetNext())
if (p_match->GetNext()) {
p_match->GetNext()->SetPrev(p_match->GetPrev());
else
}
else {
m_last = p_match->GetPrev();
}
delete p_match;
this->m_count--;
@@ -204,8 +215,9 @@ template <class T>
inline MxBool MxListCursor<T>::Find(T p_obj)
{
for (m_match = m_list->m_first; m_match && m_list->Compare(m_match->GetValue(), p_obj);
m_match = m_match->GetNext())
m_match = m_match->GetNext()) {
;
}
return m_match != NULL;
}
@@ -232,10 +244,12 @@ inline void MxListCursor<T>::Destroy()
template <class T>
inline MxBool MxListCursor<T>::Next()
{
if (!m_match)
if (!m_match) {
m_match = m_list->m_first;
else
}
else {
m_match = m_match->GetNext();
}
return m_match != NULL;
}
@@ -243,13 +257,16 @@ inline MxBool MxListCursor<T>::Next()
template <class T>
inline MxBool MxListCursor<T>::Next(T& p_obj)
{
if (!m_match)
if (!m_match) {
m_match = m_list->m_first;
else
}
else {
m_match = m_match->GetNext();
}
if (m_match)
if (m_match) {
p_obj = m_match->GetValue();
}
return m_match != NULL;
}
@@ -257,10 +274,12 @@ inline MxBool MxListCursor<T>::Next(T& p_obj)
template <class T>
inline MxBool MxListCursor<T>::Prev()
{
if (!m_match)
if (!m_match) {
m_match = m_list->m_last;
else
}
else {
m_match = m_match->GetPrev();
}
return m_match != NULL;
}
@@ -268,13 +287,16 @@ inline MxBool MxListCursor<T>::Prev()
template <class T>
inline MxBool MxListCursor<T>::Prev(T& p_obj)
{
if (!m_match)
if (!m_match) {
m_match = m_list->m_last;
else
}
else {
m_match = m_match->GetPrev();
}
if (m_match)
if (m_match) {
p_obj = m_match->GetValue();
}
return m_match != NULL;
}
@@ -282,8 +304,9 @@ inline MxBool MxListCursor<T>::Prev(T& p_obj)
template <class T>
inline MxBool MxListCursor<T>::Current(T& p_obj)
{
if (m_match)
if (m_match) {
p_obj = m_match->GetValue();
}
return m_match != NULL;
}
@@ -292,8 +315,9 @@ template <class T>
inline MxBool MxListCursor<T>::First(T& p_obj)
{
m_match = m_list->m_first;
if (m_match)
if (m_match) {
p_obj = m_match->GetValue();
}
return m_match != NULL;
}
@@ -302,8 +326,9 @@ template <class T>
inline MxBool MxListCursor<T>::Last(T& p_obj)
{
m_match = m_list->m_last;
if (m_match)
if (m_match) {
p_obj = m_match->GetValue();
}
return m_match != NULL;
}
@@ -311,15 +336,17 @@ inline MxBool MxListCursor<T>::Last(T& p_obj)
template <class T>
inline void MxListCursor<T>::SetValue(T p_obj)
{
if (m_match)
if (m_match) {
m_match->SetValue(p_obj);
}
}
template <class T>
inline void MxListCursor<T>::Prepend(T p_newobj)
{
if (m_match)
if (m_match) {
m_list->InsertEntry(p_newobj, m_match->GetPrev(), m_match);
}
}
#endif // MXLIST_H

14
LEGO1/omni/include/mxloopingflcpresenter.h
View File

@@ -9,20 +9,20 @@
class MxLoopingFlcPresenter : public MxFlcPresenter {
public:
MxLoopingFlcPresenter();
virtual ~MxLoopingFlcPresenter() override;
~MxLoopingFlcPresenter() override;
// FUNCTION: LEGO1 0x100b4380
inline virtual const char* ClassName() const override // vtable+0x0c
inline const char* ClassName() const override // vtable+0x0c
{
// STRING: LEGO1 0x10101e20
return "MxLoopingFlcPresenter";
}
virtual void RepeatingTickle() override; // vtable+0x24
virtual MxResult AddToManager() override; // vtable+0x34
virtual void Destroy() override; // vtable+0x38
virtual void NextFrame() override; // vtable+0x64
virtual void VTable0x88(); // vtable+0x88
void RepeatingTickle() override; // vtable+0x24
MxResult AddToManager() override; // vtable+0x34
void Destroy() override; // vtable+0x38
void NextFrame() override; // vtable+0x64
virtual void VTable0x88(); // vtable+0x88
// SYNTHETIC: LEGO1 0x100b4390
// MxLoopingFlcPresenter::`scalar deleting destructor'

10
LEGO1/omni/include/mxloopingmidipresenter.h
View File

@@ -8,21 +8,21 @@
class MxLoopingMIDIPresenter : public MxMIDIPresenter {
public:
// FUNCTION: LEGO1 0x100b1830
inline virtual const char* ClassName() const override // vtable+0x0c
inline const char* ClassName() const override // vtable+0x0c
{
// STRING: LEGO1 0x10101de0
return "MxLoopingMIDIPresenter";
}
// FUNCTION: LEGO1 0x100b1840
inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
inline MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, MxLoopingMIDIPresenter::ClassName()) || MxMIDIPresenter::IsA(p_name);
}
virtual void StreamingTickle() override; // vtable+0x20
virtual void DoneTickle() override; // vtable+0x2c
virtual MxResult PutData() override; // vtable+0x4c
void StreamingTickle() override; // vtable+0x20
void DoneTickle() override; // vtable+0x2c
MxResult PutData() override; // vtable+0x4c
};
// SYNTHETIC: LEGO1 0x100b19c0

16
LEGO1/omni/include/mxloopingsmkpresenter.h
View File

@@ -9,21 +9,21 @@
class MxLoopingSmkPresenter : public MxSmkPresenter {
public:
MxLoopingSmkPresenter();
virtual ~MxLoopingSmkPresenter() override; // vtable+0x00
~MxLoopingSmkPresenter() override; // vtable+0x00
// FUNCTION: LEGO1 0x100b4920
inline virtual const char* ClassName() const override // vtable+0x0c
inline const char* ClassName() const override // vtable+0x0c
{
// STRING: LEGO1 0x10101e08
return "MxLoopingSmkPresenter";
}
virtual void RepeatingTickle() override; // vtable+0x24
virtual MxResult AddToManager() override; // vtable+0x34
virtual void Destroy() override; // vtable+0x38
virtual void NextFrame() override; // vtable+0x64
virtual void VTable0x88() override; // vtable+0x88
virtual void VTable0x8c(); // vtable+0x8c
void RepeatingTickle() override; // vtable+0x24
MxResult AddToManager() override; // vtable+0x34
void Destroy() override; // vtable+0x38
void NextFrame() override; // vtable+0x64
void VTable0x88() override; // vtable+0x88
virtual void VTable0x8c(); // vtable+0x8c
private:
void Init();

4
LEGO1/omni/include/mxmediamanager.h
View File

@@ -12,9 +12,9 @@
class MxMediaManager : public MxCore {
public:
MxMediaManager();
virtual ~MxMediaManager() override;
~MxMediaManager() override;
virtual MxResult Tickle() override; // vtable+08
MxResult Tickle() override; // vtable+08
virtual MxResult InitPresenters(); // vtable+14
virtual void Destroy(); // vtable+18
virtual void RegisterPresenter(MxPresenter& p_presenter); // vtable+1c

24
LEGO1/omni/include/mxmediapresenter.h
View File

@@ -13,34 +13,34 @@ public:
inline MxMediaPresenter() { Init(); }
// FUNCTION: LEGO1 0x1000c550
virtual ~MxMediaPresenter() override { Destroy(TRUE); }
~MxMediaPresenter() override { Destroy(TRUE); }
virtual MxResult Tickle() override; // vtable+0x08
MxResult Tickle() override; // vtable+0x08
// FUNCTION: LEGO1 0x1000c5c0
inline virtual const char* ClassName() const override // vtable+0x0c
inline const char* ClassName() const override // vtable+0x0c
{
// STRING: LEGO1 0x100f074c
return "MxMediaPresenter";
}
// FUNCTION: LEGO1 0x1000c5d0
inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
inline MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, MxMediaPresenter::ClassName()) || MxPresenter::IsA(p_name);
}
virtual void StreamingTickle() override; // vtable+0x20
virtual void RepeatingTickle() override; // vtable+0x24
virtual void DoneTickle() override; // vtable+0x2c
void StreamingTickle() override; // vtable+0x20
void RepeatingTickle() override; // vtable+0x24
void DoneTickle() override; // vtable+0x2c
// FUNCTION: LEGO1 0x1000c5b0
virtual void Destroy() override { Destroy(FALSE); } // vtable+0x38
void Destroy() override { Destroy(FALSE); } // vtable+0x38
virtual MxResult StartAction(MxStreamController*, MxDSAction*) override; // vtable+0x3c
virtual void EndAction() override; // vtable+0x40
virtual void Enable(MxBool p_enable) override; // vtable+0x54
virtual void LoopChunk(MxStreamChunk* p_chunk); // vtable+0x58
MxResult StartAction(MxStreamController*, MxDSAction*) override; // vtable+0x3c
void EndAction() override; // vtable+0x40
void Enable(MxBool p_enable) override; // vtable+0x54
virtual void LoopChunk(MxStreamChunk* p_chunk); // vtable+0x58
// SYNTHETIC: LEGO1 0x1000c680
// MxMediaPresenter::`scalar deleting destructor'

22
LEGO1/omni/include/mxmidipresenter.h
View File

@@ -9,29 +9,29 @@
class MxMIDIPresenter : public MxMusicPresenter {
public:
MxMIDIPresenter();
virtual ~MxMIDIPresenter() override;
~MxMIDIPresenter() override;
// FUNCTION: LEGO1 0x100c2650
inline virtual const char* ClassName() const override // vtable+0x0c
inline const char* ClassName() const override // vtable+0x0c
{
// STRING: LEGO1 0x10101df8
return "MxMIDIPresenter";
}
// FUNCTION: LEGO1 0x100c2660
inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
inline MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, MxMIDIPresenter::ClassName()) || MxMusicPresenter::IsA(p_name);
}
virtual void ReadyTickle() override; // vtable+0x18
virtual void StartingTickle() override; // vtable+0x1c
virtual void StreamingTickle() override; // vtable+0x20
virtual void DoneTickle() override; // vtable+0x2c
virtual void Destroy() override; // vtable+0x38
virtual void EndAction() override; // vtable+0x40
virtual MxResult PutData() override; // vtable+0x4c
virtual void SetVolume(MxS32 p_volume) override; // vtable+0x60
void ReadyTickle() override; // vtable+0x18
void StartingTickle() override; // vtable+0x1c
void StreamingTickle() override; // vtable+0x20
void DoneTickle() override; // vtable+0x2c
void Destroy() override; // vtable+0x38
void EndAction() override; // vtable+0x40
MxResult PutData() override; // vtable+0x4c
void SetVolume(MxS32 p_volume) override; // vtable+0x60
// SYNTHETIC: LEGO1 0x100c27a0
// MxMIDIPresenter::`scalar deleting destructor'

6
LEGO1/omni/include/mxmusicmanager.h
View File

@@ -11,10 +11,10 @@
class MxMusicManager : public MxAudioManager {
public:
MxMusicManager();
virtual ~MxMusicManager() override;
~MxMusicManager() override;
virtual void Destroy() override; // vtable+18
virtual void SetVolume(MxS32 p_volume) override; // vtable+2c
void Destroy() override; // vtable+18
void SetVolume(MxS32 p_volume) override; // vtable+2c
virtual MxResult Create(MxU32 p_frequencyMS, MxBool p_createThread); // vtable+30
inline MxBool GetMIDIInitialized() { return m_midiInitialized; }

10
LEGO1/omni/include/mxmusicpresenter.h
View File

@@ -8,23 +8,23 @@
class MxMusicPresenter : public MxAudioPresenter {
public:
MxMusicPresenter();
virtual ~MxMusicPresenter() override;
~MxMusicPresenter() override;
// FUNCTION: LEGO1 0x100c23a0
inline virtual const char* ClassName() const override // vtable+0x0c
inline const char* ClassName() const override // vtable+0x0c
{
// STRING: LEGO1 0x10101e48
return "MxMusicPresenter";
}
// FUNCTION: LEGO1 0x100c23b0
inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
inline MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, MxMusicPresenter::ClassName()) || MxAudioPresenter::IsA(p_name);
}
virtual MxResult AddToManager() override; // vtable+0x34
virtual void Destroy() override; // vtable+0x38
MxResult AddToManager() override; // vtable+0x34
void Destroy() override; // vtable+0x38
// SYNTHETIC: LEGO1 0x100c24c0
// MxMusicPresenter::`scalar deleting destructor'

4
LEGO1/omni/include/mxnextactiondatastart.h
View File

@@ -16,14 +16,14 @@ public:
}
// FUNCTION: LEGO1 0x100c1900
inline virtual const char* ClassName() const override // vtable+0x0c
inline const char* ClassName() const override // vtable+0x0c
{
// STRING: LEGO1 0x101025a0
return "MxNextActionDataStart";
}
// FUNCTION: LEGO1 0x100c1910
inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
inline MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, MxNextActionDataStart::ClassName()) || MxCore::IsA(p_name);
}

4
LEGO1/omni/include/mxnotificationmanager.h
View File

@@ -36,9 +36,9 @@ private:
public:
MxNotificationManager();
virtual ~MxNotificationManager(); // vtable+0x00 (scalar deleting destructor)
~MxNotificationManager() override; // vtable+0x00 (scalar deleting destructor)
virtual MxResult Tickle(); // vtable+0x08
MxResult Tickle() override; // vtable+0x08
// TODO: Where does this method come from?
virtual MxResult Create(MxU32 p_frequencyMS, MxBool p_createThread); // vtable+0x14
void Register(MxCore* p_listener);

4
LEGO1/omni/include/mxobjectfactory.h
View File

@@ -24,14 +24,14 @@ public:
MxObjectFactory();
// FUNCTION: LEGO1 0x10008f70
inline virtual const char* ClassName() const override // vtable+0x0c
inline const char* ClassName() const override // vtable+0x0c
{
// STRING: LEGO1 0x100f0730
return "MxObjectFactory";
}
// FUNCTION: LEGO1 0x10008f80
inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
inline MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, MxObjectFactory::ClassName()) || MxCore::IsA(p_name);
}

4
LEGO1/omni/include/mxomni.h
View File

@@ -38,9 +38,9 @@ public:
static void SetSound3D(MxBool p_use3dSound);
MxOmni();
virtual ~MxOmni() override;
~MxOmni() override;
virtual MxLong Notify(MxParam& p_param) override; // vtable+04
MxLong Notify(MxParam& p_param) override; // vtable+04
virtual void Init(); // vtable+14
virtual MxResult Create(MxOmniCreateParam& p_param); // vtable+18
virtual void Destroy(); // vtable+1c

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

@@ -15,7 +15,7 @@ public:
MxPalette();
MxPalette(const RGBQUAD*);
virtual ~MxPalette();
~MxPalette() override;
void ApplySystemEntriesToPalette(LPPALETTEENTRY p_entries);
MxPalette* Clone();

8
LEGO1/omni/include/mxpresenter.h
View File

@@ -29,19 +29,19 @@ public:
MxPresenter() { Init(); }
// FUNCTION: LEGO1 0x1000bf00
virtual ~MxPresenter() override{}; // vtable+0x00
~MxPresenter() override{}; // vtable+0x00
virtual MxResult Tickle() override; // vtable+0x08
MxResult Tickle() override; // vtable+0x08
// FUNCTION: LEGO1 0x1000bfe0
inline virtual const char* ClassName() const override // vtable+0x0c
inline const char* ClassName() const override // vtable+0x0c
{
// STRING: LEGO1 0x100f0740
return "MxPresenter";
}
// FUNCTION: LEGO1 0x1000bff0
inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
inline MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, MxPresenter::ClassName()) || MxCore::IsA(p_name);
}

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

@@ -14,7 +14,7 @@ public:
MxPresenterList(MxBool p_ownership = FALSE) : MxPtrList<MxPresenter>(p_ownership) {}
// FUNCTION: LEGO1 0x1001cd00
virtual MxS8 Compare(MxPresenter* p_a, MxPresenter* p_b) override
MxS8 Compare(MxPresenter* p_a, MxPresenter* p_b) override
{
return p_a == p_b ? 0 : p_a < p_b ? -1 : 1;
} // vtable+0x14

10
LEGO1/omni/include/mxramstreamcontroller.h
View File

@@ -12,22 +12,22 @@ public:
inline MxRAMStreamController() {}
// FUNCTION: LEGO1 0x100b9430
inline virtual const char* ClassName() const override // vtable+0x0c
inline const char* ClassName() const override // vtable+0x0c
{
// STRING: LEGO1 0x10102118
return "MxRAMStreamController";
}
// FUNCTION: LEGO1 0x100b9440
inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
inline MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, MxRAMStreamController::ClassName()) ||
!strcmp(p_name, MxStreamController::ClassName()) || MxCore::IsA(p_name);
}
virtual MxResult Open(const char* p_filename) override;
virtual MxResult VTable0x20(MxDSAction* p_action) override;
virtual MxResult VTable0x24(MxDSAction* p_action) override;
MxResult Open(const char* p_filename) override;
MxResult VTable0x20(MxDSAction* p_action) override;
MxResult VTable0x24(MxDSAction* p_action) override;
private:
MxDSBuffer m_buffer; // 0x64

16
LEGO1/omni/include/mxramstreamprovider.h
View File

@@ -8,26 +8,26 @@
class MxRAMStreamProvider : public MxStreamProvider {
public:
MxRAMStreamProvider();
virtual ~MxRAMStreamProvider() override;
~MxRAMStreamProvider() override;
// FUNCTION: LEGO1 0x100d0970
inline virtual const char* ClassName() const override // vtable+0x0c
inline const char* ClassName() const override // vtable+0x0c
{
// STRING: LEGO1 0x10102864
return "MxRAMStreamProvider";
}
// FUNCTION: LEGO1 0x100d0980
inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
inline MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, MxRAMStreamProvider::ClassName()) || MxStreamProvider::IsA(p_name);
}
virtual MxResult SetResourceToGet(MxStreamController* p_resource) override; // vtable+0x14
virtual MxU32 GetFileSize() override; // vtable+0x18
virtual MxS32 GetStreamBuffersNum() override; // vtable+0x1c
virtual MxU32 GetLengthInDWords() override; // vtable+0x24
virtual MxU32* GetBufferForDWords() override; // vtable+0x28
MxResult SetResourceToGet(MxStreamController* p_resource) override; // vtable+0x14
MxU32 GetFileSize() override; // vtable+0x18
MxS32 GetStreamBuffersNum() override; // vtable+0x1c
MxU32 GetLengthInDWords() override; // vtable+0x24
MxU32* GetBufferForDWords() override; // vtable+0x28
inline MxU8* GetBufferOfFileSize() { return m_pBufferOfFileSize; }

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

@@ -11,7 +11,7 @@
class MxRegion : public MxCore {
public:
MxRegion();
virtual ~MxRegion() override;
~MxRegion() override;
virtual void Reset(); // vtable+0x14
virtual void VTable0x18(MxRect32& p_rect); // vtable+0x18

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

@@ -8,7 +8,7 @@
class MxRegionCursor : public MxCore {
public:
MxRegionCursor(MxRegion* p_region);
virtual ~MxRegionCursor() override;
~MxRegionCursor() override;
virtual MxRect32* VTable0x14(MxRect32& p_rect); // vtable+0x14
virtual MxRect32* VTable0x18(); // vtable+0x18

20
LEGO1/omni/include/mxsmkpresenter.h
View File

@@ -10,28 +10,28 @@
class MxSmkPresenter : public MxVideoPresenter {
public:
MxSmkPresenter();
virtual ~MxSmkPresenter() override;
~MxSmkPresenter() override;
// FUNCTION: LEGO1 0x100b3730
inline virtual const char* ClassName() const override // vtable+0x0c
inline const char* ClassName() const override // vtable+0x0c
{
// STRING: LEGO1 0x10101e38
return "MxSmkPresenter";
}
// FUNCTION: LEGO1 0x100b3740
inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
inline MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, MxSmkPresenter::ClassName()) || MxVideoPresenter::IsA(p_name);
}
virtual MxResult AddToManager() override; // vtable+0x34
virtual void Destroy() override; // vtable+0x38
virtual void LoadHeader(MxStreamChunk* p_chunk) override; // vtable+0x5c
virtual void CreateBitmap() override; // vtable+0x60
virtual void LoadFrame(MxStreamChunk* p_chunk) override; // vtable+0x68
virtual void RealizePalette() override; // vtable+0x70
virtual void VTable0x88(); // vtable+0x88
MxResult AddToManager() override; // vtable+0x34
void Destroy() override; // vtable+0x38
void LoadHeader(MxStreamChunk* p_chunk) override; // vtable+0x5c
void CreateBitmap() override; // vtable+0x60
void LoadFrame(MxStreamChunk* p_chunk) override; // vtable+0x68
void RealizePalette() override; // vtable+0x70
virtual void VTable0x88(); // vtable+0x88
// SYNTHETIC: LEGO1 0x100b3850
// MxSmkPresenter::`scalar deleting destructor'

6
LEGO1/omni/include/mxsoundmanager.h
View File

@@ -12,10 +12,10 @@
class MxSoundManager : public MxAudioManager {
public:
MxSoundManager();
virtual ~MxSoundManager() override; // vtable+0x00
~MxSoundManager() override; // vtable+0x00
virtual void Destroy() override; // vtable+0x18
virtual void SetVolume(MxS32 p_volume) override; // vtable+0x2c
void Destroy() override; // vtable+0x18
void SetVolume(MxS32 p_volume) override; // vtable+0x2c
virtual MxResult Create(MxU32 p_frequencyMS, MxBool p_createThread); // vtable+0x30
virtual void Pause(); // vtable+0x34
virtual void Resume(); // vtable+0x38

10
LEGO1/omni/include/mxsoundpresenter.h
View File

@@ -9,25 +9,25 @@
class MxSoundPresenter : public MxAudioPresenter {
public:
// FUNCTION: LEGO1 0x1000d430
virtual ~MxSoundPresenter() override { Destroy(TRUE); }
~MxSoundPresenter() override { Destroy(TRUE); }
// FUNCTION: LEGO1 0x1000d4a0
inline virtual const char* ClassName() const // vtable+0x0c
inline const char* ClassName() const override // vtable+0x0c
{
// STRING: LEGO1 0x100f07a0
return "MxSoundPresenter";
}
// FUNCTION: LEGO1 0x1000d4b0
inline virtual MxBool IsA(const char* p_name) const // vtable+0x10
inline MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, MxSoundPresenter::ClassName()) || MxAudioPresenter::IsA(p_name);
}
virtual MxResult AddToManager() override; // vtable+0x34
MxResult AddToManager() override; // vtable+0x34
// FUNCTION: LEGO1 0x1000d490
virtual void Destroy() override { Destroy(FALSE); } // vtable+0x38
void Destroy() override { Destroy(FALSE); } // vtable+0x38
// SYNTHETIC: LEGO1 0x1000d5c0
// MxSoundPresenter::`scalar deleting destructor'

32
LEGO1/omni/include/mxstillpresenter.h
View File

@@ -11,37 +11,37 @@ public:
MxStillPresenter() { m_bitmapInfo = NULL; }
// FUNCTION: LEGO1 0x10043550
virtual ~MxStillPresenter() override { Destroy(TRUE); } // vtable+0x00
~MxStillPresenter() override { Destroy(TRUE); } // vtable+0x00
// FUNCTION: LEGO1 0x100435c0
inline virtual const char* ClassName() const override // vtable+0x0c
inline const char* ClassName() const override // vtable+0x0c
{
// STRING: LEGO1 0x100f0184
return "MxStillPresenter";
}
// FUNCTION: LEGO1 0x100435d0
inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
inline MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, MxStillPresenter::ClassName()) || MxVideoPresenter::IsA(p_name);
}
virtual void StartingTickle() override; // vtable+0x1c
virtual void StreamingTickle() override; // vtable+0x20
virtual void RepeatingTickle() override; // vtable+0x24
virtual void ParseExtra() override; // vtable+0x30
void StartingTickle() override; // vtable+0x1c
void StreamingTickle() override; // vtable+0x20
void RepeatingTickle() override; // vtable+0x24
void ParseExtra() override; // vtable+0x30
// FUNCTION: LEGO1 0x100435b0
virtual void Destroy() override { Destroy(FALSE); } // vtable+0x38
void Destroy() override { Destroy(FALSE); } // vtable+0x38
virtual void Enable(MxBool p_enable) override; // vtable+0x54
virtual void LoadHeader(MxStreamChunk* p_chunk) override; // vtable+0x5c
virtual void CreateBitmap() override; // vtable+0x60
virtual void NextFrame() override; // vtable+0x64
virtual void LoadFrame(MxStreamChunk* p_chunk) override; // vtable+0x68
virtual void RealizePalette() override; // vtable+0x70
virtual void VTable0x88(MxS32 p_x, MxS32 p_y); // vtable+0x88
virtual MxStillPresenter* Clone(); // vtable+0x8c
void Enable(MxBool p_enable) override; // vtable+0x54
void LoadHeader(MxStreamChunk* p_chunk) override; // vtable+0x5c
void CreateBitmap() override; // vtable+0x60
void NextFrame() override; // vtable+0x64
void LoadFrame(MxStreamChunk* p_chunk) override; // vtable+0x68
void RealizePalette() override; // vtable+0x70
virtual void VTable0x88(MxS32 p_x, MxS32 p_y); // vtable+0x88
virtual MxStillPresenter* Clone(); // vtable+0x8c
private:
void Destroy(MxBool p_fromDestructor);

6
LEGO1/omni/include/mxstreamchunk.h
View File

@@ -12,17 +12,17 @@ class MxStreamListMxDSSubscriber;
class MxStreamChunk : public MxDSChunk {
public:
inline MxStreamChunk() : m_buffer(NULL) {}
virtual ~MxStreamChunk() override;
~MxStreamChunk() override;
// FUNCTION: LEGO1 0x100b1fe0
inline virtual const char* ClassName() const override // vtable+0x0c
inline const char* ClassName() const override // vtable+0x0c
{
// STRING: LEGO1 0x10101e5c
return "MxStreamChunk";
}
// FUNCTION: LEGO1 0x100b1ff0
inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
inline MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, MxStreamChunk::ClassName()) || MxDSChunk::IsA(p_name);
}

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

@@ -19,7 +19,7 @@ public:
MxStreamChunkList() { m_customDestructor = Destroy; }
// FUNCTION: LEGO1 0x100b5900
virtual MxS8 Compare(MxStreamChunk* p_a, MxStreamChunk* p_b) override
MxS8 Compare(MxStreamChunk* p_a, MxStreamChunk* p_b) override
{
return p_a == p_b ? 0 : p_a < p_b ? -1 : 1;
} // vtable+0x14

6
LEGO1/omni/include/mxstreamcontroller.h
View File

@@ -19,17 +19,17 @@ class MxDSStreamingAction;
class MxStreamController : public MxCore {
public:
MxStreamController();
virtual ~MxStreamController() override; // vtable+0x00
~MxStreamController() override; // vtable+0x00
// FUNCTION: LEGO1 0x100c0f10
inline virtual const char* ClassName() const override // vtable+0x0c
inline const char* ClassName() const override // vtable+0x0c
{
// STRING: LEGO1 0x10102130
return "MxStreamController";
}
// FUNCTION: LEGO1 0x100c0f20
inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
inline MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, MxStreamController::ClassName()) || MxCore::IsA(p_name);
}

10
LEGO1/omni/include/mxstreamer.h
View File

@@ -58,7 +58,7 @@ public:
m_controller = p_ctrlr;
}
virtual MxNotificationParam* Clone() override;
MxNotificationParam* Clone() override;
MxStreamController* GetController() { return m_controller; }
@@ -76,22 +76,22 @@ public:
};
MxStreamer();
virtual ~MxStreamer() override; // vtable+0x00
~MxStreamer() override; // vtable+0x00
MxStreamController* Open(const char* p_name, MxU16 p_openMode);
MxLong Close(const char* p_name);
virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
MxLong Notify(MxParam& p_param) override; // vtable+0x04
// FUNCTION: LEGO1 0x100b9000
inline virtual const char* ClassName() const override // vtable+0x0c
inline const char* ClassName() const override // vtable+0x0c
{
// STRING: LEGO1 0x1010210c
return "MxStreamer";
}
// FUNCTION: LEGO1 0x100b9010
inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
inline MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, MxStreamer::ClassName()) || MxCore::IsA(p_name);
}

6
LEGO1/omni/include/mxstreamlist.h
View File

@@ -11,8 +11,9 @@ class MxStreamList : public list<T> {
public:
MxBool PopFront(T& p_obj)
{
if (this->empty())
if (this->empty()) {
return FALSE;
}
p_obj = this->front();
this->pop_front();
@@ -29,8 +30,9 @@ public:
// instead of MxDSAction. Until then, we use this helper.
MxBool PopFrontStreamingAction(MxDSStreamingAction*& p_obj)
{
if (empty())
if (empty()) {
return FALSE;
}
p_obj = (MxDSStreamingAction*) front();
pop_front();

4
LEGO1/omni/include/mxstreamprovider.h
View File

@@ -15,13 +15,13 @@ public:
inline MxStreamProvider() : m_pLookup(NULL), m_pFile(NULL) {}
// FUNCTION: LEGO1 0x100d07e0
inline virtual const char* ClassName() const override // vtable+0x0c
inline const char* ClassName() const override // vtable+0x0c
{
return "MxStreamProvider";
}
// FUNCTION: LEGO1 0x100d07f0
inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
inline MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, MxStreamProvider::ClassName()) || MxCore::IsA(p_name);
}

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

@@ -8,7 +8,7 @@
class MxString : public MxCore {
public:
MxString(const MxString& p_str);
virtual ~MxString();
~MxString() override;
const MxString& operator=(const char* p_data);
MxString();

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

@@ -47,7 +47,7 @@ protected:
class MxTickleThread : public MxThread {
public:
MxTickleThread(MxCore* p_target, MxS32 p_frequencyMS);
virtual ~MxTickleThread() {}
~MxTickleThread() override {}
MxResult Run() override;

4
LEGO1/omni/include/mxticklemanager.h
View File

@@ -36,9 +36,9 @@ typedef list<MxTickleClient*> MxTickleClientPtrList;
class MxTickleManager : public MxCore {
public:
inline MxTickleManager() {}
virtual ~MxTickleManager(); // vtable+0x00 (scalar deleting destructor)
~MxTickleManager() override; // vtable+0x00 (scalar deleting destructor)
virtual MxResult Tickle(); // vtable+0x08
MxResult Tickle() override; // vtable+0x08
virtual void RegisterClient(MxCore* p_client, MxTime p_interval); // vtable+0x14
virtual void UnregisterClient(MxCore* p_client); // vtable+0x18
virtual void SetClientTickleInterval(MxCore* p_client, MxTime p_interval); // vtable+0x1c

6
LEGO1/omni/include/mxtimer.h
View File

@@ -16,10 +16,12 @@ public:
inline MxLong GetTime()
{
if (this->m_isRunning)
if (this->m_isRunning) {
return g_lastTimeTimerStarted;
else
}
else {
return g_lastTimeCalculated - this->m_startTime;
}
}
// SYNTHETIC: LEGO1 0x100ae0d0

4
LEGO1/omni/include/mxvariabletable.h
View File

@@ -16,8 +16,8 @@ public:
static void Destroy(MxVariable* p_obj) { p_obj->Destroy(); }
virtual MxS8 Compare(MxVariable*, MxVariable*) override; // vtable+0x14
virtual MxU32 Hash(MxVariable*) override; // vtable+0x18
MxS8 Compare(MxVariable*, MxVariable*) override; // vtable+0x14
MxU32 Hash(MxVariable*) override; // vtable+0x18
// SYNTHETIC: LEGO1 0x100afdd0
// MxVariableTable::`scalar deleting destructor'

6
LEGO1/omni/include/mxvideomanager.h
View File

@@ -14,10 +14,10 @@
class MxVideoManager : public MxMediaManager {
public:
MxVideoManager();
virtual ~MxVideoManager() override;
~MxVideoManager() override;
virtual MxResult Tickle() override; // vtable+0x08
virtual void Destroy() override; // vtable+0x18
MxResult Tickle() override; // vtable+0x08
void Destroy() override; // vtable+0x18
virtual MxResult VTable0x28(
MxVideoParam& p_videoParam,
LPDIRECTDRAW p_pDirectDraw,

26
LEGO1/omni/include/mxvideopresenter.h
View File

@@ -13,34 +13,34 @@ public:
MxVideoPresenter() { Init(); }
// FUNCTION: LEGO1 0x1000c740
virtual ~MxVideoPresenter() override { Destroy(TRUE); } // vtable+0x00
~MxVideoPresenter() override { Destroy(TRUE); } // vtable+0x00
// FUNCTION: LEGO1 0x1000c820
inline virtual const char* ClassName() const override // vtable+0x0c
inline const char* ClassName() const override // vtable+0x0c
{
// STRING: LEGO1 0x100f0760
return "MxVideoPresenter";
}
// FUNCTION: LEGO1 0x1000c830
inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
inline MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, MxVideoPresenter::ClassName()) || MxMediaPresenter::IsA(p_name);
}
virtual void ReadyTickle() override; // vtable+0x18
virtual void StartingTickle() override; // vtable+0x1c
virtual void StreamingTickle() override; // vtable+0x20
virtual void RepeatingTickle() override; // vtable+0x24
virtual void Unk5Tickle() override; // vtable+0x28
virtual MxResult AddToManager() override; // vtable+0x34
void ReadyTickle() override; // vtable+0x18
void StartingTickle() override; // vtable+0x1c
void StreamingTickle() override; // vtable+0x20
void RepeatingTickle() override; // vtable+0x24
void Unk5Tickle() override; // vtable+0x28
MxResult AddToManager() override; // vtable+0x34
// FUNCTION: LEGO1 0x1000c7a0
virtual void Destroy() override { Destroy(FALSE); } // vtable+0x38
void Destroy() override { Destroy(FALSE); } // vtable+0x38
virtual void EndAction() override; // vtable+0x40
virtual MxResult PutData() override; // vtable+0x4c
virtual MxBool IsHit(MxS32 p_x, MxS32 p_y) override; // vtable+0x50
void EndAction() override; // vtable+0x40
MxResult PutData() override; // vtable+0x4c
MxBool IsHit(MxS32 p_x, MxS32 p_y) override; // vtable+0x50
// FUNCTION: LEGO1 0x1000c700
virtual void LoadHeader(MxStreamChunk* p_chunk){}; // vtable+0x5c

34
LEGO1/omni/include/mxwavepresenter.h
View File

@@ -13,38 +13,38 @@ public:
MxWavePresenter() { Init(); }
// FUNCTION: LEGO1 0x1000d640
virtual ~MxWavePresenter() override { Destroy(TRUE); } // vtable+0x00
~MxWavePresenter() override { Destroy(TRUE); } // vtable+0x00
// FUNCTION: LEGO1 0x1000d6c0
inline virtual const char* ClassName() const override // vtable+0x0c
inline const char* ClassName() const override // vtable+0x0c
{
// STRING: LEGO1 0x100f07b4
return "MxWavePresenter";
}
// FUNCTION: LEGO1 0x1000d6d0
inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
inline MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, MxWavePresenter::ClassName()) || MxSoundPresenter::IsA(p_name);
}
virtual void ReadyTickle() override; // vtable+0x18
virtual void StartingTickle() override; // vtable+0x1c
virtual void StreamingTickle() override; // vtable+0x20
virtual void DoneTickle() override; // vtable+0x2c
virtual void ParseExtra() override; // vtable+0x30
virtual MxResult AddToManager() override; // vtable+0x34
void ReadyTickle() override; // vtable+0x18
void StartingTickle() override; // vtable+0x1c
void StreamingTickle() override; // vtable+0x20
void DoneTickle() override; // vtable+0x2c
void ParseExtra() override; // vtable+0x30
MxResult AddToManager() override; // vtable+0x34
// FUNCTION: LEGO1 0x1000d6a0
virtual void Destroy() override { Destroy(FALSE); } // vtable+0x38
void Destroy() override { Destroy(FALSE); } // vtable+0x38
virtual void EndAction() override; // vtable+0x40
virtual MxResult PutData() override; // vtable+0x4c
virtual void Enable(MxBool p_enable) override; // vtable+0x54
virtual void LoopChunk(MxStreamChunk* p_chunk) override; // vtable+0x58
virtual void SetVolume(MxS32 p_volume) override; // vtable+0x60
virtual void Pause(); // vtable+0x64
virtual void Resume(); // vtable+0x68
void EndAction() override; // vtable+0x40
MxResult PutData() override; // vtable+0x4c
void Enable(MxBool p_enable) override; // vtable+0x54
void LoopChunk(MxStreamChunk* p_chunk) override; // vtable+0x58
void SetVolume(MxS32 p_volume) override; // vtable+0x60
virtual void Pause(); // vtable+0x64
virtual void Resume(); // vtable+0x68
// FUNCTION: LEGO1 0x1000d6b0
virtual MxBool IsPaused() { return m_paused; } // vtable+0x6c