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

Add clang-tidy readability-redundant-inline-specifier (#1060)

Browse Source 
* Add clang-tidy readability-redundant-inline-specifier

* fix

* Update CONTRIBUTING.md

* format

* fix
This commit is contained in:
Christian Semmler
2024-07-04 16:06:32 -07:00
committed by GitHub
parent 0873b782c5
commit bee101b1f4
186 changed files with 872 additions and 886 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,12 +10,7 @@ class MxPresenter;
// SIZE 0x14
class MxActionNotificationParam : public MxNotificationParam {
public:
inline MxActionNotificationParam(
NotificationId p_type,
MxCore* p_sender,
MxDSAction* p_action,
MxBool p_reallocAction
)
MxActionNotificationParam(NotificationId p_type, MxCore* p_sender, MxDSAction* p_action, MxBool p_reallocAction)
: MxNotificationParam(p_type, p_sender)
{
MxDSAction* oldAction = p_action;
@@ -35,7 +30,7 @@ public:
}
// FUNCTION: LEGO1 0x10051050
inline ~MxActionNotificationParam() override
~MxActionNotificationParam() override
{
if (!m_realloc) {
return;
@@ -52,7 +47,7 @@ public:
return new MxActionNotificationParam(m_type, m_sender, m_action, m_realloc);
} // vtable+0x04
inline MxDSAction* GetAction() { return m_action; }
MxDSAction* GetAction() { return m_action; }
protected:
MxDSAction* m_action; // 0x0c
@@ -63,7 +58,7 @@ protected:
// SIZE 0x14
class MxStartActionNotificationParam : public MxActionNotificationParam {
public:
inline MxStartActionNotificationParam(
MxStartActionNotificationParam(
NotificationId p_type,
MxCore* p_sender,
MxDSAction* p_action,
@@ -80,12 +75,7 @@ public:
// SIZE 0x14
class MxEndActionNotificationParam : public MxActionNotificationParam {
public:
inline MxEndActionNotificationParam(
NotificationId p_type,
MxCore* p_sender,
MxDSAction* p_action,
MxBool p_reallocAction
)
MxEndActionNotificationParam(NotificationId p_type, MxCore* p_sender, MxDSAction* p_action, MxBool p_reallocAction)
: MxActionNotificationParam(p_type, p_sender, p_action, p_reallocAction)
{
}
@@ -101,7 +91,7 @@ public:
// SIZE 0x18
class MxType4NotificationParam : public MxActionNotificationParam {
public:
inline MxType4NotificationParam(MxCore* p_sender, MxDSAction* p_action, MxPresenter* p_unk0x14)
MxType4NotificationParam(MxCore* p_sender, MxDSAction* p_action, MxPresenter* p_unk0x14)
: MxActionNotificationParam(c_notificationType4, p_sender, p_action, FALSE)
{
m_unk0x14 = p_unk0x14;

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

@@ -29,7 +29,7 @@ public:
void Dec();
// FUNCTION: BETA10 0x101236d0
inline MxString& GetKey() { return m_key; }
MxString& GetKey() { return m_key; }
// SYNTHETIC: BETA10 0x10124a50
// MxAtom::`scalar deleting destructor'
@@ -66,12 +66,12 @@ public:
MxAtomId& operator=(const MxAtomId& p_atomId);
// FUNCTION: BETA10 0x100178d0
inline MxBool operator==(const MxAtomId& p_atomId) const { return this->m_internal == p_atomId.m_internal; }
MxBool operator==(const MxAtomId& p_atomId) const { return this->m_internal == p_atomId.m_internal; }
#ifdef COMPAT_MODE
// Required for modern compilers.
// MSVC 4.20 uses a synthetic function from INCLUDE/UTILITY that inverts operator==
inline MxBool operator!=(const MxAtomId& p_atomId) const { return this->m_internal != p_atomId.m_internal; }
MxBool operator!=(const MxAtomId& p_atomId) const { return this->m_internal != p_atomId.m_internal; }
#endif
// FUNCTION: BETA10 0x10025d40

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

@@ -19,13 +19,13 @@ public:
// FUNCTION: LEGO1 0x1000d280
// FUNCTION: BETA10 0x1008cb70
inline const char* ClassName() const override // vtable+0x0c
const char* ClassName() const override // vtable+0x0c
{
return HandlerClassName();
}
// FUNCTION: LEGO1 0x1000d290
inline MxBool IsA(const char* p_name) const override // vtable+0x10
MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, MxAudioPresenter::ClassName()) || MxMediaPresenter::IsA(p_name);
}

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

@@ -85,7 +85,7 @@ public:
// Pixel data may be stored with padding.
// https://learn.microsoft.com/en-us/windows/win32/medfound/image-stride
// FUNCTION: BETA10 0x1002c510
inline MxLong AlignToFourByte(MxLong p_value) const { return (p_value + 3) & -4; }
MxLong AlignToFourByte(MxLong p_value) const { return (p_value + 3) & -4; }
// DECOMP: This could be a free function. It is static here because it has no
// reference to "this". In the beta it is called in two places:
@@ -95,27 +95,27 @@ public:
static MxLong HeightAbs(MxLong p_value) { return p_value > 0 ? p_value : -p_value; }
// FUNCTION: BETA10 0x10142030
inline BITMAPINFOHEADER* GetBmiHeader() const { return m_bmiHeader; }
BITMAPINFOHEADER* GetBmiHeader() const { return m_bmiHeader; }
// FUNCTION: BETA10 0x1002c440
inline MxLong GetBmiWidth() const { return m_bmiHeader->biWidth; }
inline MxLong GetBmiStride() const { return ((m_bmiHeader->biWidth + 3) & -4); }
inline MxLong GetBmiHeight() const { return m_bmiHeader->biHeight; }
MxLong GetBmiWidth() const { return m_bmiHeader->biWidth; }
MxLong GetBmiStride() const { return ((m_bmiHeader->biWidth + 3) & -4); }
MxLong GetBmiHeight() const { return m_bmiHeader->biHeight; }
// FUNCTION: BETA10 0x1002c470
inline MxLong GetBmiHeightAbs() const { return HeightAbs(m_bmiHeader->biHeight); }
MxLong GetBmiHeightAbs() const { return HeightAbs(m_bmiHeader->biHeight); }
// FUNCTION: BETA10 0x10083900
inline MxU8* GetImage() const { return m_data; }
MxU8* GetImage() const { return m_data; }
// FUNCTION: BETA10 0x100838d0
inline MxBITMAPINFO* GetBitmapInfo() const { return m_info; }
MxBITMAPINFO* GetBitmapInfo() const { return m_info; }
// FUNCTION: BETA10 0x100982b0
inline MxLong GetDataSize() const { return AlignToFourByte(m_bmiHeader->biWidth) * GetBmiHeightAbs(); }
MxLong GetDataSize() const { return AlignToFourByte(m_bmiHeader->biWidth) * GetBmiHeightAbs(); }
// FUNCTION: BETA10 0x1002c4b0
inline MxBool IsTopDown()
MxBool IsTopDown()
{
if (m_bmiHeader->biCompression == BI_RGB_TOPDOWN) {
return TRUE;
@@ -130,7 +130,7 @@ public:
: -p_bitmap->AlignToFourByte(p_bitmap->GetBmiWidth()))
// FUNCTION: BETA10 0x1002c320
inline MxU8* GetStart(MxS32 p_left, MxS32 p_top)
MxU8* GetStart(MxS32 p_left, MxS32 p_top)
{
if (m_bmiHeader->biCompression == BI_RGB) {
return m_data + p_left +
@@ -150,10 +150,10 @@ public:
private:
// FUNCTION: BETA10 0x1013dd10
inline MxLong MxBitmapInfoSize() const { return sizeof(MxBITMAPINFO); }
MxLong MxBitmapInfoSize() const { return sizeof(MxBITMAPINFO); }
// FUNCTION: BETA10 0x1013dd30
inline MxBool IsBottomUp()
MxBool IsBottomUp()
{
if (m_bmiHeader->biCompression == BI_RGB_TOPDOWN) {
return FALSE;

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

@@ -27,13 +27,13 @@ public:
// FUNCTION: LEGO1 0x100b6210
// FUNCTION: BETA10 0x1004da00
inline const char* ClassName() const override // vtable+0x0c
const char* ClassName() const override // vtable+0x0c
{
return HandlerClassName();
}
// FUNCTION: LEGO1 0x100b6220
inline MxBool IsA(const char* p_name) const override // vtable+0x10
MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, MxCompositePresenter::ClassName()) || MxPresenter::IsA(p_name);
}
@@ -56,7 +56,7 @@ public:
return TRUE;
} // vtable+0x64
inline MxCompositePresenterList* GetList() { return &m_list; }
MxCompositePresenterList* GetList() { return &m_list; }
protected:
MxCompositePresenterList m_list; // 0x40

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

@@ -23,7 +23,7 @@ public:
// FUNCTION: LEGO1 0x100144c0
// FUNCTION: BETA10 0x100126d0
inline virtual const char* ClassName() const // vtable+0c
virtual const char* ClassName() const // vtable+0c
{
// STRING: LEGO1 0x100f007c
return "MxCore";
@@ -31,12 +31,12 @@ public:
// FUNCTION: LEGO1 0x100140d0
// FUNCTION: BETA10 0x10012680
inline virtual MxBool IsA(const char* p_name) const // vtable+10
virtual MxBool IsA(const char* p_name) const // vtable+10
{
return !strcmp(p_name, MxCore::ClassName());
}
inline MxU32 GetId() { return m_id; }
MxU32 GetId() { return m_id; }
// SYNTHETIC: LEGO1 0x100ae1c0
// SYNTHETIC: BETA10 0x1012c0d0

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

@@ -21,14 +21,14 @@ public:
MxResult Tickle() override; // vtable+0x08
// FUNCTION: LEGO1 0x100c7360
inline const char* ClassName() const override // vtable+0x0c
const char* ClassName() const override // vtable+0x0c
{
// STRING: LEGO1 0x10102144
return "MxDiskStreamController";
}
// FUNCTION: LEGO1 0x100c7370
inline MxBool IsA(const char* p_name) const override // vtable+0x10
MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, MxDiskStreamController::ClassName()) || MxStreamController::IsA(p_name);
}
@@ -41,7 +41,7 @@ public:
MxResult VTable0x30(MxDSAction* p_action) override; // vtable+0x30
virtual MxResult VTable0x34(undefined4); // vtable+0x34
inline MxBool GetUnk0xc4() const { return m_unk0xc4; }
MxBool GetUnk0xc4() const { return m_unk0xc4; }
MxResult FUN_100c7890(MxDSStreamingAction* p_action);
void FUN_100c7cb0(MxDSStreamingAction* p_action);

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

@@ -16,7 +16,7 @@ class MxDSStreamingAction;
// SIZE 0x1c
class MxDiskStreamProviderThread : public MxThread {
public:
inline MxDiskStreamProviderThread() : MxThread() { m_target = NULL; }
MxDiskStreamProviderThread() : MxThread() { m_target = NULL; }
MxResult Run() override;
MxResult StartWithTarget(MxDiskStreamProvider* p_target);
@@ -30,14 +30,14 @@ public:
~MxDiskStreamProvider() override;
// FUNCTION: LEGO1 0x100d1160
inline const char* ClassName() const override // vtable+0x0c
const char* ClassName() const override // vtable+0x0c
{
// STRING: LEGO1 0x1010287c
return "MxDiskStreamProvider";
}
// FUNCTION: LEGO1 0x100d1170
inline MxBool IsA(const char* p_name) const override // vtable+0x10
MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, MxDiskStreamProvider::ClassName()) || MxStreamProvider::IsA(p_name);
}

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

@@ -95,9 +95,9 @@ public:
static LPDIRECTDRAWSURFACE CreateCursorSurface();
static LPDIRECTDRAWSURFACE CopySurface(LPDIRECTDRAWSURFACE p_src);
inline LPDIRECTDRAWSURFACE GetDirectDrawSurface1() { return m_ddSurface1; }
inline LPDIRECTDRAWSURFACE GetDirectDrawSurface2() { return m_ddSurface2; }
inline MxVideoParam& GetVideoParam() { return m_videoParam; }
LPDIRECTDRAWSURFACE GetDirectDrawSurface1() { return m_ddSurface1; }
LPDIRECTDRAWSURFACE GetDirectDrawSurface2() { return m_ddSurface2; }
MxVideoParam& GetVideoParam() { return m_videoParam; }
void FUN_100bb500(
MxU8** p_bitmapData,

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

@@ -34,7 +34,7 @@ public:
// FUNCTION: LEGO1 0x100ad980
// FUNCTION: BETA10 0x1012bcf0
inline const char* ClassName() const override // vtable+0x0c
const char* ClassName() const override // vtable+0x0c
{
// STRING: LEGO1 0x101013f4
return "MxDSAction";
@@ -42,7 +42,7 @@ public:
// FUNCTION: LEGO1 0x100ad990
// FUNCTION: BETA10 0x1012bd10
inline MxBool IsA(const char* p_name) const override // vtable+0x10
MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, MxDSAction::ClassName()) || MxDSObject::IsA(p_name);
}
@@ -62,48 +62,48 @@ public:
void AppendExtra(MxU16 p_extraLength, const char* p_extraData);
// FUNCTION: BETA10 0x1003a560
inline void GetExtra(MxU16& p_extraLength, char*& p_extraData)
void GetExtra(MxU16& p_extraLength, char*& p_extraData)
{
p_extraLength = m_extraLength;
p_extraData = m_extraData;
}
// FUNCTION: BETA10 0x1003cf70
inline MxU32 GetFlags() { return m_flags; }
MxU32 GetFlags() { return m_flags; }
// FUNCTION: BETA10 0x1004daa0
inline void SetFlags(MxU32 p_flags) { m_flags = p_flags; }
void SetFlags(MxU32 p_flags) { m_flags = p_flags; }
inline char* GetExtraData() { return m_extraData; }
inline MxU16 GetExtraLength() const { return m_extraLength; }
char* GetExtraData() { return m_extraData; }
MxU16 GetExtraLength() const { return m_extraLength; }
// FUNCTION: BETA10 0x1005a560
inline MxLong GetStartTime() const { return m_startTime; }
MxLong GetStartTime() const { return m_startTime; }
// FUNCTION: BETA10 0x1012be80
inline MxS32 GetLoopCount() { return m_loopCount; }
MxS32 GetLoopCount() { return m_loopCount; }
inline void SetLoopCount(MxS32 p_loopCount) { m_loopCount = p_loopCount; }
void SetLoopCount(MxS32 p_loopCount) { m_loopCount = p_loopCount; }
// FUNCTION: BETA10 0x1003db50
inline Mx3DPointFloat& GetLocation() { return m_location; }
Mx3DPointFloat& GetLocation() { return m_location; }
// FUNCTION: BETA10 0x1003db80
inline Mx3DPointFloat& GetDirection() { return m_direction; }
Mx3DPointFloat& GetDirection() { return m_direction; }
// FUNCTION: BETA10 0x1003dbb0
inline Mx3DPointFloat& GetUp() { return m_up; }
Mx3DPointFloat& GetUp() { return m_up; }
inline void SetLocation(const Vector3& p_location) { m_location = p_location; }
inline void SetDirection(const Vector3& p_direction) { m_direction = p_direction; }
inline void SetUp(const Vector3& p_up) { m_up = p_up; }
inline MxCore* GetUnknown84() { return m_unk0x84; }
inline void SetUnknown84(MxCore* p_unk0x84) { m_unk0x84 = p_unk0x84; }
inline MxCore* GetOrigin() { return m_origin; }
inline void SetOrigin(MxCore* p_origin) { m_origin = p_origin; }
void SetLocation(const Vector3& p_location) { m_location = p_location; }
void SetDirection(const Vector3& p_direction) { m_direction = p_direction; }
void SetUp(const Vector3& p_up) { m_up = p_up; }
MxCore* GetUnknown84() { return m_unk0x84; }
void SetUnknown84(MxCore* p_unk0x84) { m_unk0x84 = p_unk0x84; }
MxCore* GetOrigin() { return m_origin; }
void SetOrigin(MxCore* p_origin) { m_origin = p_origin; }
inline MxBool IsLooping() const { return m_flags & c_looping; }
inline MxBool IsBit3() const { return m_flags & c_bit3; }
MxBool IsLooping() const { return m_flags & c_looping; }
MxBool IsBit3() const { return m_flags & c_bit3; }
// SYNTHETIC: LEGO1 0x100ada60
// SYNTHETIC: BETA10 0x1012be40

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

@@ -14,14 +14,14 @@ public:
MxDSAnim& operator=(MxDSAnim& p_dsAnim);
// FUNCTION: LEGO1 0x100c9060
inline const char* ClassName() const override // vtable+0x0c
const char* ClassName() const override // vtable+0x0c
{
// STRING: LEGO1 0x101025d8
return "MxDSAnim";
}
// FUNCTION: LEGO1 0x100c9070
inline MxBool IsA(const char* p_name) const override // vtable+0x10
MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, MxDSAnim::ClassName()) || MxDSMediaAction::IsA(p_name);
}

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

@@ -25,7 +25,7 @@ public:
~MxDSBuffer() override;
// FUNCTION: LEGO1 0x100c6500
inline const char* ClassName() const override // vtable+0x0c
const char* ClassName() const override // vtable+0x0c
{
// STRING: LEGO1 0x101025b8
return "MxDSBuffer";
@@ -63,17 +63,17 @@ public:
static MxCore* ReadChunk(MxDSBuffer* p_buffer, MxU32* p_chunkData, MxU16 p_flags);
static MxResult Append(MxU8* p_buffer1, MxU8* p_buffer2);
inline MxU8* GetBuffer() { return m_pBuffer; }
inline MxU8** GetBufferRef() { return &m_pBuffer; }
inline undefined4 GetUnknown14() { return m_unk0x14; }
inline MxU16 GetRefCount() { return m_referenceCount; }
inline Type GetMode() { return m_mode; }
inline MxU32 GetWriteOffset() { return m_writeOffset; }
inline MxU32 GetBytesRemaining() { return m_bytesRemaining; }
inline void SetUnknown14(undefined4 p_unk0x14) { m_unk0x14 = p_unk0x14; }
inline void SetUnknown1c(undefined4 p_unk0x1c) { m_unk0x1c = p_unk0x1c; }
inline void SetMode(Type p_mode) { m_mode = p_mode; }
inline void SetUnk30(MxDSStreamingAction* p_unk0x30) { m_unk0x30 = p_unk0x30; }
MxU8* GetBuffer() { return m_pBuffer; }
MxU8** GetBufferRef() { return &m_pBuffer; }
undefined4 GetUnknown14() { return m_unk0x14; }
MxU16 GetRefCount() { return m_referenceCount; }
Type GetMode() { return m_mode; }
MxU32 GetWriteOffset() { return m_writeOffset; }
MxU32 GetBytesRemaining() { return m_bytesRemaining; }
void SetUnknown14(undefined4 p_unk0x14) { m_unk0x14 = p_unk0x14; }
void SetUnknown1c(undefined4 p_unk0x1c) { m_unk0x1c = p_unk0x1c; }
void SetMode(Type p_mode) { m_mode = p_mode; }
void SetUnk30(MxDSStreamingAction* p_unk0x30) { m_unk0x30 = p_unk0x30; }
// SYNTHETIC: LEGO1 0x100c6510
// MxDSBuffer::`scalar deleting destructor'

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

@@ -19,37 +19,37 @@ public:
~MxDSChunk() override;
// FUNCTION: LEGO1 0x100be0c0
inline const char* ClassName() const override // vtable+0x0c
const char* ClassName() const override // vtable+0x0c
{
// STRING: LEGO1 0x10101e6c
return "MxDSChunk";
}
// FUNCTION: LEGO1 0x100be0d0
inline MxBool IsA(const char* p_name) const override // vtable+0x10
MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, MxDSChunk::ClassName()) || MxCore::IsA(p_name);
}
static MxU32 GetHeaderSize();
inline static MxU32* IntoType(MxU8* p_buffer) { return (MxU32*) p_buffer; }
inline static MxU32* IntoLength(MxU8* p_buffer) { return (MxU32*) (p_buffer + 4); }
inline static MxU32 Size(MxU32 p_dataSize) { return (p_dataSize & 1) + p_dataSize + 8; }
inline static MxU8* End(MxU8* p_buffer) { return p_buffer + Size(*IntoLength(p_buffer)); }
static MxU32* IntoType(MxU8* p_buffer) { return (MxU32*) p_buffer; }
static MxU32* IntoLength(MxU8* p_buffer) { return (MxU32*) (p_buffer + 4); }
static MxU32 Size(MxU32 p_dataSize) { return (p_dataSize & 1) + p_dataSize + 8; }
static MxU8* End(MxU8* p_buffer) { return p_buffer + Size(*IntoLength(p_buffer)); }
inline void SetChunkFlags(MxU16 p_flags) { m_flags = p_flags; }
inline void SetObjectId(undefined4 p_objectid) { m_objectId = p_objectid; }
inline void SetTime(MxLong p_time) { m_time = p_time; }
inline void SetLength(MxU32 p_length) { m_length = p_length; }
inline void SetData(MxU8* p_data) { m_data = p_data; }
void SetChunkFlags(MxU16 p_flags) { m_flags = p_flags; }
void SetObjectId(undefined4 p_objectid) { m_objectId = p_objectid; }
void SetTime(MxLong p_time) { m_time = p_time; }
void SetLength(MxU32 p_length) { m_length = p_length; }
void SetData(MxU8* p_data) { m_data = p_data; }
inline MxU16 GetChunkFlags() { return m_flags; }
inline undefined4 GetObjectId() { return m_objectId; }
inline MxLong GetTime() { return m_time; }
inline MxU32 GetLength() { return m_length; }
inline MxU8* GetData() { return m_data; }
MxU16 GetChunkFlags() { return m_flags; }
undefined4 GetObjectId() { return m_objectId; }
MxLong GetTime() { return m_time; }
MxU32 GetLength() { return m_length; }
MxU8* GetData() { return m_data; }
inline void Release()
void Release()
{
if (m_data) {
delete[] m_data;

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

@@ -13,14 +13,14 @@ public:
MxDSEvent& operator=(MxDSEvent& p_dsEvent);
// FUNCTION: LEGO1 0x100c9660
inline const char* ClassName() const override // vtable+0x0c
const char* ClassName() const override // vtable+0x0c
{
// STRING: LEGO1 0x101025f0
return "MxDSEvent";
}
// FUNCTION: LEGO1 0x100c9670
inline MxBool IsA(const char* p_name) const override // vtable+0x10
MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, MxDSEvent::ClassName()) || MxDSMediaAction::IsA(p_name);
}

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

@@ -24,14 +24,14 @@ public:
#endif
// FUNCTION: LEGO1 0x100c0120
inline const char* ClassName() const override // vtable+0x0c
const char* ClassName() const override // vtable+0x0c
{
// STRING: LEGO1 0x10102594
return "MxDSFile";
}
// FUNCTION: LEGO1 0x100c0130
inline MxBool IsA(const char* p_name) const override // vtable+0x10
MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, MxDSFile::ClassName()) || MxDSSource::IsA(p_name);
}
@@ -43,9 +43,9 @@ public:
MxULong GetBufferSize() override; // vtable+0x28
MxULong GetStreamBuffersNum() override; // vtable+0x2c
inline void SetFileName(const char* p_filename) { m_filename = p_filename; }
void SetFileName(const char* p_filename) { m_filename = p_filename; }
inline MxS32 CalcFileSize() { return GetFileSize(m_io.m_info.hmmio, NULL); }
MxS32 CalcFileSize() { return GetFileSize(m_io.m_info.hmmio, NULL); }
// SYNTHETIC: LEGO1 0x100c01e0
// MxDSFile::`scalar deleting destructor'

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

@@ -18,7 +18,7 @@ public:
// FUNCTION: LEGO1 0x100c8be0
// FUNCTION: BETA10 0x1015c700
inline const char* ClassName() const override // vtable+0x0c
const char* ClassName() const override // vtable+0x0c
{
// STRING: LEGO1 0x100f7624
return "MxDSMediaAction";
@@ -26,7 +26,7 @@ public:
// FUNCTION: LEGO1 0x100c8bf0
// FUNCTION: BETA10 0x1015c6a0
inline MxBool IsA(const char* p_name) const override // vtable+0x10
MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, MxDSMediaAction::ClassName()) || MxDSAction::IsA(p_name);
}
@@ -43,19 +43,19 @@ public:
void CopyMediaSrcPath(const char* p_mediaSrcPath);
// FUNCTION: LEGO1 0x100186e0
inline const char* GetMediaSrcPath() { return m_mediaSrcPath; }
const char* GetMediaSrcPath() { return m_mediaSrcPath; }
// FUNCTION: BETA10 0x1013c2e0
inline MxS32 GetFramesPerSecond() const { return m_framesPerSecond; }
MxS32 GetFramesPerSecond() const { return m_framesPerSecond; }
// FUNCTION: BETA10 0x1012efd0
inline MxS32 GetMediaFormat() const { return m_mediaFormat; }
MxS32 GetMediaFormat() const { return m_mediaFormat; }
// FUNCTION: BETA10 0x1013b860
inline MxS32 GetPaletteManagement() const { return m_paletteManagement; }
MxS32 GetPaletteManagement() const { return m_paletteManagement; }
// FUNCTION: BETA10 0x1005ab60
inline MxLong GetSustainTime() const { return m_sustainTime; }
MxLong GetSustainTime() const { return m_sustainTime; }
private:
struct Unk0x9cStruct {

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

@@ -15,14 +15,14 @@ public:
MxDSMultiAction& operator=(MxDSMultiAction& p_dsMultiAction);
// FUNCTION: LEGO1 0x100c9f50
inline const char* ClassName() const override // vtable+0x0c
const char* ClassName() const override // vtable+0x0c
{
// STRING: LEGO1 0x10101dbc
return "MxDSMultiAction";
}
// FUNCTION: LEGO1 0x100c9f60
inline MxBool IsA(const char* p_name) const override // vtable+0x10
MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, MxDSMultiAction::ClassName()) || MxDSAction::IsA(p_name);
}
@@ -36,7 +36,7 @@ public:
MxBool HasId(MxU32 p_objectId) override; // vtable+34;
void SetUnknown90(MxLong p_unk0x90) override; // vtable+38;
inline MxDSActionList* GetActionList() const { return m_actions; }
MxDSActionList* GetActionList() const { return m_actions; }
// SYNTHETIC: LEGO1 0x100ca040
// MxDSMultiAction::`scalar deleting destructor'

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

@@ -39,11 +39,11 @@ public:
// FUNCTION: LEGO1 0x100bf730
// FUNCTION: BETA10 0x1012bdd0
inline const char* ClassName() const override { return "MxDSObject"; } // vtable+0c
const char* ClassName() const override { return "MxDSObject"; } // vtable+0c
// FUNCTION: LEGO1 0x100bf740
// FUNCTION: BETA10 0x1012bd70
inline MxBool IsA(const char* p_name) const override
MxBool IsA(const char* p_name) const override
{
return !strcmp(p_name, MxDSObject::ClassName()) || MxCore::IsA(p_name);
} // vtable+10;
@@ -55,31 +55,31 @@ public:
// FUNCTION: ISLE 0x401c40
// FUNCTION: LEGO1 0x10005530
// FUNCTION: BETA10 0x100152e0
inline virtual void SetAtomId(MxAtomId p_atomId) { m_atomId = p_atomId; } // vtable+20;
virtual void SetAtomId(MxAtomId p_atomId) { m_atomId = p_atomId; } // vtable+20;
// FUNCTION: BETA10 0x1012ef90
inline Type GetType() const { return (Type) m_type; }
Type GetType() const { return (Type) m_type; }
// FUNCTION: BETA10 0x1012efb0
inline const char* GetSourceName() const { return m_sourceName; }
const char* GetSourceName() const { return m_sourceName; }
inline const char* GetObjectName() const { return m_objectName; }
inline MxU32 GetObjectId() { return m_objectId; }
inline const MxAtomId& GetAtomId() { return m_atomId; }
inline MxS16 GetUnknown24() { return m_unk0x24; }
inline MxPresenter* GetUnknown28() { return m_unk0x28; }
const char* GetObjectName() const { return m_objectName; }
MxU32 GetObjectId() { return m_objectId; }
const MxAtomId& GetAtomId() { return m_atomId; }
MxS16 GetUnknown24() { return m_unk0x24; }
MxPresenter* GetUnknown28() { return m_unk0x28; }
inline void SetType(Type p_type) { m_type = p_type; }
void SetType(Type p_type) { m_type = p_type; }
// FUNCTION: BETA10 0x100152b0
inline void SetObjectId(MxU32 p_objectId) { m_objectId = p_objectId; }
void SetObjectId(MxU32 p_objectId) { m_objectId = p_objectId; }
// FUNCTION: BETA10 0x10039570
inline void SetUnknown24(MxS16 p_unk0x24) { m_unk0x24 = p_unk0x24; }
void SetUnknown24(MxS16 p_unk0x24) { m_unk0x24 = p_unk0x24; }
inline void SetUnknown28(MxPresenter* p_unk0x28) { m_unk0x28 = p_unk0x28; }
void SetUnknown28(MxPresenter* p_unk0x28) { m_unk0x28 = p_unk0x28; }
inline void ClearAtom() { m_atomId.Clear(); }
void ClearAtom() { m_atomId.Clear(); }
// SYNTHETIC: LEGO1 0x100bf7c0
// SYNTHETIC: BETA10 0x10148770

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

@@ -13,14 +13,14 @@ public:
MxDSObjectAction& operator=(MxDSObjectAction& p_dsObjectAction);
// FUNCTION: LEGO1 0x100c88e0
inline const char* ClassName() const override // vtable+0x0c
const char* ClassName() const override // vtable+0x0c
{
// STRING: LEGO1 0x101025c4
return "MxDSObjectAction";
}
// FUNCTION: LEGO1 0x100c88f0
inline MxBool IsA(const char* p_name) const override // vtable+0x10
MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, MxDSObjectAction::ClassName()) || MxDSMediaAction::IsA(p_name);
}

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

@@ -14,14 +14,14 @@ public:
MxDSParallelAction& operator=(MxDSParallelAction& p_dsParallelAction);
// FUNCTION: LEGO1 0x100caf00
inline const char* ClassName() const override // vtable+0x0c
const char* ClassName() const override // vtable+0x0c
{
// STRING: LEGO1 0x10102608
return "MxDSParallelAction";
}
// FUNCTION: LEGO1 0x100caf10
inline MxBool IsA(const char* p_name) const override // vtable+0x10
MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, MxDSParallelAction::ClassName()) || MxDSMultiAction::IsA(p_name);
}

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

@@ -16,14 +16,14 @@ public:
MxDSSelectAction& operator=(MxDSSelectAction& p_dsSelectAction);
// FUNCTION: LEGO1 0x100cb6f0
inline const char* ClassName() const override // vtable+0x0c
const char* ClassName() const override // vtable+0x0c
{
// STRING: LEGO1 0x1010261c
return "MxDSSelectAction";
}
// FUNCTION: LEGO1 0x100cb700
inline MxBool IsA(const char* p_name) const override // vtable+0x10
MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, MxDSSelectAction::ClassName()) || MxDSParallelAction::IsA(p_name);
}

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

@@ -15,14 +15,14 @@ public:
MxDSSerialAction& operator=(MxDSSerialAction& p_dsSerialAction);
// FUNCTION: LEGO1 0x100caad0
inline const char* ClassName() const override // vtable+0x0c
const char* ClassName() const override // vtable+0x0c
{
// STRING: LEGO1 0x100f75dc
return "MxDSSerialAction";
}
// FUNCTION: LEGO1 0x100caae0
inline MxBool IsA(const char* p_name) const override // vtable+0x10
MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, MxDSSerialAction::ClassName()) || MxDSMultiAction::IsA(p_name);
}

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

@@ -14,14 +14,14 @@ public:
MxDSSound& operator=(MxDSSound& p_dsSound);
// FUNCTION: LEGO1 0x100c9330
inline const char* ClassName() const override // vtable+0x0c
const char* ClassName() const override // vtable+0x0c
{
// STRING: LEGO1 0x101025e4
return "MxDSSound";
}
// FUNCTION: LEGO1 0x100c9340
inline MxBool IsA(const char* p_name) const override // vtable+0x10
MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, MxDSSound::ClassName()) || MxDSMediaAction::IsA(p_name);
}
@@ -30,7 +30,7 @@ public:
void Deserialize(MxU8*& p_source, MxS16 p_unk0x24) override; // vtable+1c;
MxDSAction* Clone() override; // vtable+2c;
inline MxS32 GetVolume() const { return m_volume; }
MxS32 GetVolume() const { return m_volume; }
// SYNTHETIC: LEGO1 0x100c9450
// MxDSSound::`scalar deleting destructor'

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

@@ -15,14 +15,14 @@ public:
~MxDSSource() override { delete[] m_pBuffer; }
// FUNCTION: LEGO1 0x100c0010
inline const char* ClassName() const override // vtable+0x0c
const char* ClassName() const override // vtable+0x0c
{
// STRING: LEGO1 0x10102588
return "MxDSSource";
}
// FUNCTION: LEGO1 0x100c0020
inline MxBool IsA(const char* p_name) const override // vtable+0x10
MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, MxDSSource::ClassName()) || MxCore::IsA(p_name);
}
@@ -36,7 +36,7 @@ public:
virtual MxULong GetStreamBuffersNum() = 0; // vtable+0x2c
virtual MxLong GetLengthInDWords(); // vtable+0x30
virtual MxU32* GetBuffer(); // vtable+0x34
inline MxLong GetPosition() const { return m_position; }
MxLong GetPosition() const { return m_position; }
protected:
MxULong m_lengthInDWords; // 0x08

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

@@ -14,14 +14,14 @@ public:
MxDSStill& operator=(MxDSStill& p_dsStill);
// FUNCTION: LEGO1 0x100c9930
inline const char* ClassName() const override // vtable+0x0c
const char* ClassName() const override // vtable+0x0c
{
// STRING: LEGO1 0x101025fc
return "MxDSStill";
}
// FUNCTION: LEGO1 0x100c9940
inline MxBool IsA(const char* p_name) const override // vtable+0x10
MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, MxDSStill::ClassName()) || MxDSMediaAction::IsA(p_name);
}

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

@@ -31,18 +31,18 @@ public:
void SetInternalAction(MxDSAction* p_dsAction);
void FUN_100cd2d0();
inline MxU32 GetUnknown94() { return m_unk0x94; }
inline MxS32 GetUnknown9c() { return m_unk0x9c; }
inline MxDSBuffer* GetUnknowna0() { return m_unk0xa0; }
inline MxDSBuffer* GetUnknowna4() { return m_unk0xa4; }
inline MxLong GetUnknowna8() { return m_unk0xa8; }
inline MxDSAction* GetInternalAction() { return m_internalAction; }
inline MxU32 GetBufferOffset() { return m_bufferOffset; }
inline void SetUnknown94(MxU32 p_unk0x94) { m_unk0x94 = p_unk0x94; }
inline void SetUnknown9c(MxS32 p_unk0x9c) { m_unk0x9c = p_unk0x9c; }
inline void SetUnknowna0(MxDSBuffer* p_unk0xa0) { m_unk0xa0 = p_unk0xa0; }
inline void SetUnknowna4(MxDSBuffer* p_unk0xa4) { m_unk0xa4 = p_unk0xa4; }
inline void SetBufferOffset(MxU32 p_bufferOffset) { m_bufferOffset = p_bufferOffset; }
MxU32 GetUnknown94() { return m_unk0x94; }
MxS32 GetUnknown9c() { return m_unk0x9c; }
MxDSBuffer* GetUnknowna0() { return m_unk0xa0; }
MxDSBuffer* GetUnknowna4() { return m_unk0xa4; }
MxLong GetUnknowna8() { return m_unk0xa8; }
MxDSAction* GetInternalAction() { return m_internalAction; }
MxU32 GetBufferOffset() { return m_bufferOffset; }
void SetUnknown94(MxU32 p_unk0x94) { m_unk0x94 = p_unk0x94; }
void SetUnknown9c(MxS32 p_unk0x9c) { m_unk0x9c = p_unk0x9c; }
void SetUnknowna0(MxDSBuffer* p_unk0xa0) { m_unk0xa0 = p_unk0xa0; }
void SetUnknowna4(MxDSBuffer* p_unk0xa4) { m_unk0xa4 = p_unk0xa4; }
void SetBufferOffset(MxU32 p_bufferOffset) { m_bufferOffset = p_bufferOffset; }
// SYNTHETIC: LEGO1 0x100cd0b0
// MxDSStreamingAction::`scalar deleting destructor'

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

@@ -15,14 +15,14 @@ public:
~MxDSSubscriber() override;
// FUNCTION: LEGO1 0x100b7d50
inline const char* ClassName() const override // vtable+0x0c
const char* ClassName() const override // vtable+0x0c
{
// STRING: LEGO1 0x101020f8
return "MxDSSubscriber";
}
// FUNCTION: LEGO1 0x100b7d60
inline MxBool IsA(const char* p_name) const override // vtable+0x10
MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, MxDSSubscriber::ClassName()) || MxCore::IsA(p_name);
}
@@ -35,10 +35,10 @@ public:
void FreeDataChunk(MxStreamChunk* p_chunk);
// FUNCTION: BETA10 0x101354f0
inline MxU32 GetObjectId() { return m_objectId; }
MxU32 GetObjectId() { return m_objectId; }
// FUNCTION: BETA10 0x10135510
inline MxS16 GetUnknown48() { return m_unk0x48; }
MxS16 GetUnknown48() { return m_unk0x48; }
private:
MxStreamChunkList m_pendingChunks; // 0x08

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

@@ -18,14 +18,14 @@ public:
~MxEntity() override {}
// FUNCTION: LEGO1 0x1000c180
inline const char* ClassName() const override // vtable+0x0c
const char* ClassName() const override // vtable+0x0c
{
// STRING: LEGO1 0x100f0070
return "MxEntity";
}
// FUNCTION: LEGO1 0x1000c190
inline MxBool IsA(const char* p_name) const override // vtable+0x10
MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, MxEntity::ClassName()) || MxCore::IsA(p_name);
}
@@ -38,15 +38,15 @@ public:
return SUCCESS;
} // vtable+0x14
inline MxResult Create(MxDSAction& p_dsAction)
MxResult Create(MxDSAction& p_dsAction)
{
m_mxEntityId = p_dsAction.GetObjectId();
m_atom = p_dsAction.GetAtomId();
return SUCCESS;
}
inline MxS32 GetEntityId() { return m_mxEntityId; }
inline MxAtomId& GetAtom() { return m_atom; }
MxS32 GetEntityId() { return m_mxEntityId; }
MxAtomId& GetAtom() { return m_atom; }
// SYNTHETIC: LEGO1 0x1000c210
// MxEntity::`scalar deleting destructor'

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

@@ -20,13 +20,13 @@ public:
// FUNCTION: LEGO1 0x100c2c30
// FUNCTION: BETA10 0x10152f10
inline const char* ClassName() const override // vtable+0x0c
const char* ClassName() const override // vtable+0x0c
{
return HandlerClassName();
}
// FUNCTION: LEGO1 0x100c2c40
inline MxBool IsA(const char* p_name) const override // vtable+0x10
MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, MxEventPresenter::ClassName()) || MxMediaPresenter::IsA(p_name);
}

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

@@ -14,7 +14,7 @@ public:
~MxFlcPresenter() override;
// FUNCTION: LEGO1 0x1004e200
inline MxBool IsA(const char* p_name) const override // vtable+0x10
MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, MxFlcPresenter::ClassName()) || MxVideoPresenter::IsA(p_name);
}
@@ -28,7 +28,7 @@ public:
// FUNCTION: LEGO1 0x100b33f0
// FUNCTION: BETA10 0x10083760
inline const char* ClassName() const override // vtable+0x0c
const char* ClassName() const override // vtable+0x0c
{
return HandlerClassName();
}

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

@@ -20,7 +20,7 @@ public:
// FUNCTION: LEGO1 0x100b4380
// FUNCTION: BETA10 0x1013c300
inline const char* ClassName() const override // vtable+0x0c
const char* ClassName() const override // vtable+0x0c
{
return HandlerClassName();
}

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

@@ -16,13 +16,13 @@ public:
// FUNCTION: LEGO1 0x100b1830
// FUNCTION: BETA10 0x10143910
inline const char* ClassName() const override // vtable+0x0c
const char* ClassName() const override // vtable+0x0c
{
return HandlerClassName();
}
// FUNCTION: LEGO1 0x100b1840
inline MxBool IsA(const char* p_name) const override // vtable+0x10
MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, MxLoopingMIDIPresenter::ClassName()) || MxMIDIPresenter::IsA(p_name);
}

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

@@ -20,7 +20,7 @@ public:
// FUNCTION: LEGO1 0x100b4920
// FUNCTION: BETA10 0x1013c360
inline const char* ClassName() const override // vtable+0x0c
const char* ClassName() const override // vtable+0x0c
{
return HandlerClassName();
}

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

@@ -11,7 +11,7 @@ class MxDSSubscriber;
// SIZE 0x50
class MxMediaPresenter : public MxPresenter {
public:
inline MxMediaPresenter() { Init(); }
MxMediaPresenter() { Init(); }
// FUNCTION: LEGO1 0x1000c550
~MxMediaPresenter() override { Destroy(TRUE); }
@@ -27,13 +27,13 @@ public:
// FUNCTION: LEGO1 0x1000c5c0
// FUNCTION: BETA10 0x10054f20
inline const char* ClassName() const override // vtable+0x0c
const char* ClassName() const override // vtable+0x0c
{
return HandlerClassName();
}
// FUNCTION: LEGO1 0x1000c5d0
inline MxBool IsA(const char* p_name) const override // vtable+0x10
MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, MxMediaPresenter::ClassName()) || MxPresenter::IsA(p_name);
}

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

@@ -21,13 +21,13 @@ public:
// FUNCTION: LEGO1 0x100c2650
// FUNCTION: BETA10 0x10143a90
inline const char* ClassName() const override // vtable+0x0c
const char* ClassName() const override // vtable+0x0c
{
return HandlerClassName();
}
// FUNCTION: LEGO1 0x100c2660
inline MxBool IsA(const char* p_name) const override // vtable+0x10
MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, MxMIDIPresenter::ClassName()) || MxMusicPresenter::IsA(p_name);
}

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

@@ -17,8 +17,8 @@ public:
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; }
inline void GetMIDIVolume(DWORD& p_volume)
MxBool GetMIDIInitialized() { return m_midiInitialized; }
void GetMIDIVolume(DWORD& p_volume)
{
if (midiOutGetVolume((HMIDIOUT) m_midiStreamH, &p_volume)) {
p_volume = CalculateVolume(100);

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

@@ -19,13 +19,13 @@ public:
// FUNCTION: LEGO1 0x100c23a0
// FUNCTION: BETA10 0x10143a50
inline const char* ClassName() const override // vtable+0x0c
const char* ClassName() const override // vtable+0x0c
{
return HandlerClassName();
}
// FUNCTION: LEGO1 0x100c23b0
inline MxBool IsA(const char* p_name) const override // vtable+0x10
MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, MxMusicPresenter::ClassName()) || MxAudioPresenter::IsA(p_name);
}

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

@@ -8,7 +8,7 @@
class MxNextActionDataStart : public MxCore {
public:
// inlined constructor at 0x100c1847
inline MxNextActionDataStart(MxU32 p_objectId, MxS16 p_unk0x24, MxU32 p_data)
MxNextActionDataStart(MxU32 p_objectId, MxS16 p_unk0x24, MxU32 p_data)
{
m_objectId = p_objectId;
m_unk0x24 = p_unk0x24;
@@ -16,22 +16,22 @@ public:
}
// FUNCTION: LEGO1 0x100c1900
inline const char* ClassName() const override // vtable+0x0c
const char* ClassName() const override // vtable+0x0c
{
// STRING: LEGO1 0x101025a0
return "MxNextActionDataStart";
}
// FUNCTION: LEGO1 0x100c1910
inline MxBool IsA(const char* p_name) const override // vtable+0x10
MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, MxNextActionDataStart::ClassName()) || MxCore::IsA(p_name);
}
inline MxU32 GetObjectId() const { return m_objectId; }
inline MxS16 GetUnknown24() const { return m_unk0x24; }
inline MxU32 GetData() const { return m_data; }
inline void SetData(MxU32 p_data) { m_data = p_data; }
MxU32 GetObjectId() const { return m_objectId; }
MxS16 GetUnknown24() const { return m_unk0x24; }
MxU32 GetData() const { return m_data; }
void SetData(MxU32 p_data) { m_data = p_data; }
// SYNTHETIC: LEGO1 0x100c1990
// MxNextActionDataStart::`scalar deleting destructor'

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

@@ -13,8 +13,8 @@ public:
MxNotification(MxCore* p_target, const MxNotificationParam& p_param);
~MxNotification();
inline MxCore* GetTarget() { return m_target; }
inline MxNotificationParam* GetParam() { return m_param; }
MxCore* GetTarget() { return m_target; }
MxNotificationParam* GetParam() { return m_param; }
private:
MxCore* m_target; // 0x00
@@ -46,13 +46,13 @@ public:
void Unregister(MxCore* p_listener);
MxResult Send(MxCore* p_listener, const MxNotificationParam& p_param);
inline MxNotificationPtrList* GetQueue() { return m_queue; }
MxNotificationPtrList* GetQueue() { return m_queue; }
// FUNCTION: BETA10 0x10132270
inline void SetActive(MxBool p_active) { m_active = p_active; }
void SetActive(MxBool p_active) { m_active = p_active; }
// FUNCTION: BETA10 0x10132230
inline MxBool IsEmpty() const { return m_queue ? m_queue->empty() : TRUE; }
MxBool IsEmpty() const { return m_queue ? m_queue->empty() : TRUE; }
// SYNTHETIC: LEGO1 0x100ac390
// MxNotificationManager::`scalar deleting destructor'

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

@@ -38,19 +38,17 @@ enum NotificationId {
// SIZE 0x0c
class MxNotificationParam : public MxParam {
public:
inline MxNotificationParam() : m_type(c_notificationType0), m_sender(NULL) {}
inline MxNotificationParam(NotificationId p_type, MxCore* p_sender) : MxParam(), m_type(p_type), m_sender(p_sender)
{
}
MxNotificationParam() : m_type(c_notificationType0), m_sender(NULL) {}
MxNotificationParam(NotificationId p_type, MxCore* p_sender) : MxParam(), m_type(p_type), m_sender(p_sender) {}
// FUNCTION: LEGO1 0x10010390
virtual MxNotificationParam* Clone() const { return new MxNotificationParam(m_type, m_sender); } // vtable+0x04
inline NotificationId GetNotification() const { return m_type; }
inline MxCore* GetSender() const { return m_sender; }
NotificationId GetNotification() const { return m_type; }
MxCore* GetSender() const { return m_sender; }
inline void SetNotification(NotificationId p_type) { m_type = p_type; }
inline void SetSender(MxCore* p_sender) { m_sender = p_sender; }
void SetNotification(NotificationId p_type) { m_type = p_type; }
void SetSender(MxCore* p_sender) { m_sender = p_sender; }
protected:
NotificationId m_type; // 0x04

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

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

28
LEGO1/omni/include/mxomnicreateflags.h
View File

@@ -9,46 +9,46 @@ public:
MxOmniCreateFlags();
// FUNCTION: BETA10 0x10092b50
inline void CreateObjectFactory(MxBool p_enable) { m_flags1.m_bit0 = p_enable; }
void CreateObjectFactory(MxBool p_enable) { m_flags1.m_bit0 = p_enable; }
// FUNCTION: BETA10 0x10092b90
inline void CreateTickleManager(MxBool p_enable) { m_flags1.m_bit2 = p_enable; }
void CreateTickleManager(MxBool p_enable) { m_flags1.m_bit2 = p_enable; }
// FUNCTION: BETA10 0x10092bd0
inline void CreateVideoManager(MxBool p_enable) { m_flags1.m_bit4 = p_enable; }
void CreateVideoManager(MxBool p_enable) { m_flags1.m_bit4 = p_enable; }
// FUNCTION: BETA10 0x10092c10
inline void CreateSoundManager(MxBool p_enable) { m_flags1.m_bit5 = p_enable; }
void CreateSoundManager(MxBool p_enable) { m_flags1.m_bit5 = p_enable; }
// FUNCTION: BETA10 0x10130cd0
inline const MxBool CreateObjectFactory() const { return m_flags1.m_bit0; }
const MxBool CreateObjectFactory() const { return m_flags1.m_bit0; }
// FUNCTION: BETA10 0x10130cf0
inline const MxBool CreateVariableTable() const { return m_flags1.m_bit1; }
const MxBool CreateVariableTable() const { return m_flags1.m_bit1; }
// FUNCTION: BETA10 0x10130d10
inline const MxBool CreateTickleManager() const { return m_flags1.m_bit2; }
const MxBool CreateTickleManager() const { return m_flags1.m_bit2; }
// FUNCTION: BETA10 0x10130d30
inline const MxBool CreateNotificationManager() const { return m_flags1.m_bit3; }
const MxBool CreateNotificationManager() const { return m_flags1.m_bit3; }
// FUNCTION: BETA10 0x10130d50
inline const MxBool CreateVideoManager() const { return m_flags1.m_bit4; }
const MxBool CreateVideoManager() const { return m_flags1.m_bit4; }
// FUNCTION: BETA10 0x10130d70
inline const MxBool CreateSoundManager() const { return m_flags1.m_bit5; }
const MxBool CreateSoundManager() const { return m_flags1.m_bit5; }
// FUNCTION: BETA10 0x10130d90
inline const MxBool CreateMusicManager() const { return m_flags1.m_bit6; }
const MxBool CreateMusicManager() const { return m_flags1.m_bit6; }
// FUNCTION: BETA10 0x10130db0
inline const MxBool CreateEventManager() const { return m_flags1.m_bit7; }
const MxBool CreateEventManager() const { return m_flags1.m_bit7; }
// FUNCTION: BETA10 0x10130dd0
inline const MxBool CreateTimer() const { return m_flags2.m_bit1; }
const MxBool CreateTimer() const { return m_flags2.m_bit1; }
// FUNCTION: BETA10 0x10130e00
inline const MxBool CreateStreamer() const { return m_flags2.m_bit2; }
const MxBool CreateStreamer() const { return m_flags2.m_bit2; }
private:
FlagBitfield m_flags1;

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

@@ -30,7 +30,7 @@ public:
void SetPalette(LPDIRECTDRAWPALETTE p_palette);
// FUNCTION: BETA10 0x100d92c0
inline void SetOverrideSkyColor(MxBool p_value) { m_overrideSkyColor = p_value; }
void SetOverrideSkyColor(MxBool p_value) { m_overrideSkyColor = p_value; }
// SYNTHETIC: LEGO1 0x100beeb0
// SYNTHETIC: BETA10 0x10144640

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

@@ -16,14 +16,14 @@ public:
this->m_y = p_point.m_y;
}
inline MxS32 GetX() const { return m_x; }
inline MxS32 GetY() const { return m_y; }
MxS32 GetX() const { return m_x; }
MxS32 GetY() const { return m_y; }
inline void SetX(MxS32 p_x) { m_x = p_x; }
inline void SetY(MxS32 p_y) { m_y = p_y; }
void SetX(MxS32 p_x) { m_x = p_x; }
void SetY(MxS32 p_y) { m_y = p_y; }
private:
inline void CopyFrom(MxS32 p_x, MxS32 p_y)
void CopyFrom(MxS32 p_x, MxS32 p_y)
{
this->m_x = p_x;
this->m_y = p_y;

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

@@ -42,13 +42,13 @@ public:
// FUNCTION: LEGO1 0x1000bfe0
// FUNCTION: BETA10 0x1004d9b0
inline const char* ClassName() const override // vtable+0x0c
const char* ClassName() const override // vtable+0x0c
{
return HandlerClassName();
}
// FUNCTION: LEGO1 0x1000bff0
inline MxBool IsA(const char* p_name) const override // vtable+0x10
MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, MxPresenter::ClassName()) || MxCore::IsA(p_name);
}
@@ -81,7 +81,7 @@ protected:
virtual void ParseExtra(); // vtable+0x30
inline void ProgressTickleState(TickleState p_tickleState)
void ProgressTickleState(TickleState p_tickleState)
{
m_previousTickleStates |= 1 << (MxU8) m_currentTickleState;
m_currentTickleState = p_tickleState;
@@ -118,20 +118,20 @@ public:
void SendToCompositePresenter(MxOmni* p_omni);
MxBool IsEnabled();
inline MxS32 GetCurrentTickleState() const { return this->m_currentTickleState; }
inline MxPoint32 GetLocation() const { return this->m_location; }
inline MxS32 GetX() const { return this->m_location.GetX(); }
inline MxS32 GetY() const { return this->m_location.GetY(); }
inline MxS32 GetDisplayZ() const { return this->m_displayZ; }
inline MxDSAction* GetAction() const { return this->m_action; }
inline void SetAction(MxDSAction* p_action) { m_action = p_action; }
MxS32 GetCurrentTickleState() const { return this->m_currentTickleState; }
MxPoint32 GetLocation() const { return this->m_location; }
MxS32 GetX() const { return this->m_location.GetX(); }
MxS32 GetY() const { return this->m_location.GetY(); }
MxS32 GetDisplayZ() const { return this->m_displayZ; }
MxDSAction* GetAction() const { return this->m_action; }
void SetAction(MxDSAction* p_action) { m_action = p_action; }
inline void SetCompositePresenter(MxCompositePresenter* p_compositePresenter)
void SetCompositePresenter(MxCompositePresenter* p_compositePresenter)
{
m_compositePresenter = p_compositePresenter;
}
inline void SetDisplayZ(MxS32 p_displayZ) { m_displayZ = p_displayZ; }
void SetDisplayZ(MxS32 p_displayZ) { m_displayZ = p_displayZ; }
// SYNTHETIC: LEGO1 0x1000c070
// MxPresenter::`scalar deleting destructor'

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

@@ -10,17 +10,17 @@ class MxDSStreamingAction;
// SIZE 0x98
class MxRAMStreamController : public MxStreamController {
public:
inline MxRAMStreamController() {}
MxRAMStreamController() {}
// FUNCTION: LEGO1 0x100b9430
inline const char* ClassName() const override // vtable+0x0c
const char* ClassName() const override // vtable+0x0c
{
// STRING: LEGO1 0x10102118
return "MxRAMStreamController";
}
// FUNCTION: LEGO1 0x100b9440
inline MxBool IsA(const char* p_name) const override // vtable+0x10
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);

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

@@ -11,14 +11,14 @@ public:
~MxRAMStreamProvider() override;
// FUNCTION: LEGO1 0x100d0970
inline const char* ClassName() const override // vtable+0x0c
const char* ClassName() const override // vtable+0x0c
{
// STRING: LEGO1 0x10102864
return "MxRAMStreamProvider";
}
// FUNCTION: LEGO1 0x100d0980
inline MxBool IsA(const char* p_name) const override // vtable+0x10
MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, MxRAMStreamProvider::ClassName()) || MxStreamProvider::IsA(p_name);
}
@@ -29,7 +29,7 @@ public:
MxU32 GetLengthInDWords() override; // vtable+0x24
MxU32* GetBufferForDWords() override; // vtable+0x28
inline MxU8* GetBufferOfFileSize() { return m_pBufferOfFileSize; }
MxU8* GetBufferOfFileSize() { return m_pBufferOfFileSize; }
protected:
MxU32 m_bufferSize; // 0x10

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

@@ -9,33 +9,33 @@ struct MxRect16 {
MxRect16() {}
// FUNCTION: BETA10 0x100981f0
inline void SetLeft(MxS16 p_left) { m_left = p_left; }
void SetLeft(MxS16 p_left) { m_left = p_left; }
// FUNCTION: BETA10 0x10098220
inline void SetTop(MxS16 p_top) { m_top = p_top; }
void SetTop(MxS16 p_top) { m_top = p_top; }
// FUNCTION: BETA10 0x10098250
inline void SetRight(MxS16 p_right) { m_right = p_right; }
void SetRight(MxS16 p_right) { m_right = p_right; }
// FUNCTION: BETA10 0x10098280
inline void SetBottom(MxS16 p_bottom) { m_bottom = p_bottom; }
void SetBottom(MxS16 p_bottom) { m_bottom = p_bottom; }
// FUNCTION: BETA10 0x10098300
inline MxS16 GetLeft() const { return m_left; }
MxS16 GetLeft() const { return m_left; }
// FUNCTION: BETA10 0x10098330
inline MxS16 GetTop() const { return m_top; }
MxS16 GetTop() const { return m_top; }
// There is no GetRight()
// FUNCTION: BETA10 0x10098360
inline MxS16 GetBottom() const { return m_bottom; }
MxS16 GetBottom() const { return m_bottom; }
// FUNCTION: BETA10 0x10098390
inline MxS16 GetWidth() const { return m_right - m_left + 1; }
MxS16 GetWidth() const { return m_right - m_left + 1; }
// FUNCTION: BETA10 0x100983c0
inline MxS16 GetHeight() const { return m_bottom - m_top + 1; }
MxS16 GetHeight() const { return m_bottom - m_top + 1; }
private:
MxS16 m_left; // 0x00

48
LEGO1/omni/include/mxrect32.h
View File

@@ -26,7 +26,7 @@ public:
return *this;
}
inline void Intersect(const MxRect32& p_rect)
void Intersect(const MxRect32& p_rect)
{
m_left = Max(p_rect.m_left, m_left);
m_top = Max(p_rect.m_top, m_top);
@@ -34,13 +34,13 @@ public:
m_bottom = Min(p_rect.m_bottom, m_bottom);
}
inline void SetPoint(const MxPoint32& p_point)
void SetPoint(const MxPoint32& p_point)
{
this->m_left = p_point.GetX();
this->m_top = p_point.GetY();
}
inline void AddPoint(const MxPoint32& p_point)
void AddPoint(const MxPoint32& p_point)
{
this->m_left += p_point.GetX();
this->m_top += p_point.GetY();
@@ -48,7 +48,7 @@ public:
this->m_bottom += p_point.GetY();
}
inline void SubtractPoint(const MxPoint32& p_point)
void SubtractPoint(const MxPoint32& p_point)
{
this->m_left -= p_point.GetX();
this->m_top -= p_point.GetY();
@@ -56,7 +56,7 @@ public:
this->m_bottom -= p_point.GetY();
}
inline void UpdateBounds(const MxRect32& p_rect)
void UpdateBounds(const MxRect32& p_rect)
{
m_left = Min(m_left, p_rect.m_left);
m_top = Min(m_top, p_rect.m_top);
@@ -64,31 +64,31 @@ public:
m_bottom = Max(m_bottom, p_rect.m_bottom);
}
inline MxBool IsValid() const { return m_left < m_right && m_top < m_bottom; }
MxBool IsValid() const { return m_left < m_right && m_top < m_bottom; }
inline MxBool IntersectsWith(const MxRect32& p_rect) const
MxBool IntersectsWith(const MxRect32& p_rect) const
{
return m_left < p_rect.m_right && p_rect.m_left < m_right && m_top < p_rect.m_bottom && p_rect.m_top < m_bottom;
}
inline MxS32 GetWidth() const { return (m_right - m_left) + 1; }
inline MxS32 GetHeight() const { return (m_bottom - m_top) + 1; }
MxS32 GetWidth() const { return (m_right - m_left) + 1; }
MxS32 GetHeight() const { return (m_bottom - m_top) + 1; }
inline MxPoint32 GetPoint() const { return MxPoint32(this->m_left, this->m_top); }
inline MxSize32 GetSize() const { return MxSize32(this->m_right, this->m_bottom); }
MxPoint32 GetPoint() const { return MxPoint32(this->m_left, this->m_top); }
MxSize32 GetSize() const { return MxSize32(this->m_right, this->m_bottom); }
inline MxS32 GetLeft() const { return m_left; }
inline MxS32 GetTop() const { return m_top; }
inline MxS32 GetRight() const { return m_right; }
inline MxS32 GetBottom() const { return m_bottom; }
MxS32 GetLeft() const { return m_left; }
MxS32 GetTop() const { return m_top; }
MxS32 GetRight() const { return m_right; }
MxS32 GetBottom() const { return m_bottom; }
inline void SetLeft(MxS32 p_left) { m_left = p_left; }
inline void SetTop(MxS32 p_top) { m_top = p_top; }
inline void SetRight(MxS32 p_right) { m_right = p_right; }
inline void SetBottom(MxS32 p_bottom) { m_bottom = p_bottom; }
void SetLeft(MxS32 p_left) { m_left = p_left; }
void SetTop(MxS32 p_top) { m_top = p_top; }
void SetRight(MxS32 p_right) { m_right = p_right; }
void SetBottom(MxS32 p_bottom) { m_bottom = p_bottom; }
private:
inline void CopyFrom(MxS32 p_left, MxS32 p_top, MxS32 p_right, MxS32 p_bottom)
void CopyFrom(MxS32 p_left, MxS32 p_top, MxS32 p_right, MxS32 p_bottom)
{
this->m_left = p_left;
this->m_top = p_top;
@@ -96,7 +96,7 @@ private:
this->m_bottom = p_bottom;
}
inline void CopyFrom(const MxRect32& p_rect)
void CopyFrom(const MxRect32& p_rect)
{
this->m_left = p_rect.m_left;
this->m_top = p_rect.m_top;
@@ -106,7 +106,7 @@ private:
// The address might also be the constructor that calls CopyFrom
// FUNCTION: LEGO1 0x100b6fc0
inline MxRect32* CopyFrom(const MxPoint32& p_point, const MxSize32& p_size)
MxRect32* CopyFrom(const MxPoint32& p_point, const MxSize32& p_size)
{
this->m_left = p_point.GetX();
this->m_top = p_point.GetY();
@@ -115,8 +115,8 @@ private:
return this;
}
inline static MxS32 Min(MxS32 p_a, MxS32 p_b) { return p_a <= p_b ? p_a : p_b; }
inline static MxS32 Max(MxS32 p_a, MxS32 p_b) { return p_a <= p_b ? p_b : p_a; }
static MxS32 Min(MxS32 p_a, MxS32 p_b) { return p_a <= p_b ? p_a : p_b; }
static MxS32 Max(MxS32 p_a, MxS32 p_b) { return p_a <= p_b ? p_b : p_a; }
MxS32 m_left; // 0x00
MxS32 m_top; // 0x04

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

@@ -18,8 +18,8 @@ public:
virtual MxBool VTable0x1c(MxRect32& p_rect); // vtable+0x1c
virtual MxBool VTable0x20(); // vtable+0x20
inline MxRegionTopBottomList* GetTopBottomList() const { return m_list; }
inline const MxRect32& GetRect() const { return m_rect; }
MxRegionTopBottomList* GetTopBottomList() const { return m_list; }
const MxRect32& GetRect() const { return m_rect; }
friend class MxRegionCursor;

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

@@ -13,13 +13,13 @@ struct MxRegionLeftRight {
MxRegionLeftRight* Clone() { return new MxRegionLeftRight(m_left, m_right); }
inline MxS32 GetLeft() { return m_left; }
inline MxS32 GetRight() { return m_right; }
MxS32 GetLeft() { return m_left; }
MxS32 GetRight() { return m_right; }
inline void SetLeft(MxS32 p_left) { m_left = p_left; }
inline void SetRight(MxS32 p_right) { m_right = p_right; }
void SetLeft(MxS32 p_left) { m_left = p_left; }
void SetRight(MxS32 p_right) { m_right = p_right; }
inline MxBool IntersectsWith(MxRect32& p_rect) { return m_left < p_rect.GetRight() && p_rect.GetTop() < m_right; }
MxBool IntersectsWith(MxRect32& p_rect) { return m_left < p_rect.GetRight() && p_rect.GetTop() < m_right; }
private:
MxS32 m_left; // 0x00
@@ -67,13 +67,13 @@ struct MxRegionTopBottom {
void MergeOrExpandRegions(MxS32 p_left, MxS32 p_right);
MxBool CheckHorizontalOverlap(MxRect32& p_rect);
inline MxS32 GetTop() { return m_top; }
inline MxS32 GetBottom() { return m_bottom; }
MxS32 GetTop() { return m_top; }
MxS32 GetBottom() { return m_bottom; }
inline void SetTop(MxS32 p_top) { m_top = p_top; }
inline void SetBottom(MxS32 p_bottom) { m_bottom = p_bottom; }
void SetTop(MxS32 p_top) { m_top = p_top; }
void SetBottom(MxS32 p_bottom) { m_bottom = p_bottom; }
inline MxBool IntersectsWith(MxRect32& p_rect) { return m_top < p_rect.GetBottom() && p_rect.GetTop() < m_bottom; }
MxBool IntersectsWith(MxRect32& p_rect) { return m_top < p_rect.GetBottom() && p_rect.GetTop() < m_bottom; }
friend class MxRegionTopBottomList;
friend class MxRegionCursor;

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

@@ -8,11 +8,11 @@ public:
MxSize32() {}
MxSize32(MxS32 p_width, MxS32 p_height) { CopyFrom(p_width, p_height); }
inline MxS32 GetWidth() const { return m_width; }
inline MxS32 GetHeight() const { return m_height; }
MxS32 GetWidth() const { return m_width; }
MxS32 GetHeight() const { return m_height; }
private:
inline void CopyFrom(MxS32 p_width, MxS32 p_height)
void CopyFrom(MxS32 p_width, MxS32 p_height)
{
this->m_width = p_width;
this->m_height = p_height;

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

@@ -21,13 +21,13 @@ public:
// FUNCTION: LEGO1 0x100b3730
// FUNCTION: BETA10 0x1013b8c0
inline const char* ClassName() const override // vtable+0x0c
const char* ClassName() const override // vtable+0x0c
{
return HandlerClassName();
}
// FUNCTION: LEGO1 0x100b3740
inline MxBool IsA(const char* p_name) const override // vtable+0x10
MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, MxSmkPresenter::ClassName()) || MxVideoPresenter::IsA(p_name);
}

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

@@ -20,7 +20,7 @@ public:
virtual void Pause(); // vtable+0x34
virtual void Resume(); // vtable+0x38
inline LPDIRECTSOUND GetDirectSound() { return m_directSound; }
LPDIRECTSOUND GetDirectSound() { return m_directSound; }
MxS32 GetAttenuation(MxU32 p_volume);

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

@@ -19,13 +19,13 @@ public:
// FUNCTION: LEGO1 0x1000d4a0
// FUNCTION: BETA10 0x1008ca40
inline const char* ClassName() const override // vtable+0x0c
const char* ClassName() const override // vtable+0x0c
{
return HandlerClassName();
}
// FUNCTION: LEGO1 0x1000d4b0
inline MxBool IsA(const char* p_name) const override // vtable+0x10
MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, MxSoundPresenter::ClassName()) || MxAudioPresenter::IsA(p_name);
}

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

@@ -22,13 +22,13 @@ public:
// FUNCTION: LEGO1 0x100435c0
// FUNCTION: BETA10 0x10098090
inline const char* ClassName() const override // vtable+0x0c
const char* ClassName() const override // vtable+0x0c
{
return HandlerClassName();
}
// FUNCTION: LEGO1 0x100435d0
inline MxBool IsA(const char* p_name) const override // vtable+0x10
MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, MxStillPresenter::ClassName()) || MxVideoPresenter::IsA(p_name);
}

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

@@ -10,23 +10,23 @@ class MxStreamListMxDSSubscriber;
// SIZE 0x20
class MxStreamChunk : public MxDSChunk {
public:
inline MxStreamChunk() : m_buffer(NULL) {}
MxStreamChunk() : m_buffer(NULL) {}
~MxStreamChunk() override;
// FUNCTION: LEGO1 0x100b1fe0
inline const char* ClassName() const override // vtable+0x0c
const char* ClassName() const override // vtable+0x0c
{
// STRING: LEGO1 0x10101e5c
return "MxStreamChunk";
}
// FUNCTION: LEGO1 0x100b1ff0
inline MxBool IsA(const char* p_name) const override // vtable+0x10
MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, MxStreamChunk::ClassName()) || MxDSChunk::IsA(p_name);
}
inline MxDSBuffer* GetBuffer() { return m_buffer; }
MxDSBuffer* GetBuffer() { return m_buffer; }
MxResult ReadChunk(MxDSBuffer* p_buffer, MxU8* p_chunkData);
MxU32 ReadChunkHeader(MxU8* p_chunkData);

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

@@ -20,14 +20,14 @@ public:
~MxStreamController() override; // vtable+0x00
// FUNCTION: LEGO1 0x100c0f10
inline const char* ClassName() const override // vtable+0x0c
const char* ClassName() const override // vtable+0x0c
{
// STRING: LEGO1 0x10102130
return "MxStreamController";
}
// FUNCTION: LEGO1 0x100c0f20
inline MxBool IsA(const char* p_name) const override // vtable+0x10
MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, MxStreamController::ClassName()) || MxCore::IsA(p_name);
}
@@ -51,11 +51,11 @@ public:
MxResult InsertActionToList54(MxDSAction* p_action);
MxNextActionDataStart* FindNextActionDataStartFromStreamingAction(MxDSStreamingAction* p_action);
inline MxAtomId& GetAtom() { return m_atom; }
inline MxStreamProvider* GetProvider() { return m_provider; }
inline MxStreamListMxDSAction& GetUnk0x3c() { return m_unk0x3c; }
inline MxStreamListMxDSAction& GetUnk0x54() { return m_unk0x54; }
inline MxStreamListMxDSSubscriber& GetSubscriberList() { return m_subscriberList; }
MxAtomId& GetAtom() { return m_atom; }
MxStreamProvider* GetProvider() { return m_provider; }
MxStreamListMxDSAction& GetUnk0x3c() { return m_unk0x3c; }
MxStreamListMxDSAction& GetUnk0x54() { return m_unk0x54; }
MxStreamListMxDSSubscriber& GetSubscriberList() { return m_subscriberList; }
protected:
MxCriticalSection m_criticalSection; // 0x08

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

@@ -20,7 +20,7 @@ typedef MxMemoryPool<128, 2> MxMemoryPool128;
// SIZE 0x10
class MxStreamerNotification : public MxNotificationParam {
public:
inline MxStreamerNotification(NotificationId p_type, MxCore* p_sender, MxStreamController* p_ctrlr)
MxStreamerNotification(NotificationId p_type, MxCore* p_sender, MxStreamController* p_ctrlr)
: MxNotificationParam(p_type, p_sender)
{
m_controller = p_ctrlr;
@@ -53,14 +53,14 @@ public:
MxLong Notify(MxParam& p_param) override; // vtable+0x04
// FUNCTION: LEGO1 0x100b9000
inline const char* ClassName() const override // vtable+0x0c
const char* ClassName() const override // vtable+0x0c
{
// STRING: LEGO1 0x1010210c
return "MxStreamer";
}
// FUNCTION: LEGO1 0x100b9010
inline MxBool IsA(const char* p_name) const override // vtable+0x10
MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, MxStreamer::ClassName()) || MxCore::IsA(p_name);
}

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

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

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

@@ -27,16 +27,16 @@ public:
static void CharSwap(char* p_a, char* p_b);
// FUNCTION: BETA10 0x10017c50
inline char* GetData() const { return m_data; }
char* GetData() const { return m_data; }
// FUNCTION: BETA10 0x10067630
inline const MxU16 GetLength() const { return m_length; }
const MxU16 GetLength() const { return m_length; }
// FUNCTION: BETA10 0x100d8a30
inline MxBool Equal(const MxString& p_str) const { return strcmp(m_data, p_str.m_data) == 0; }
MxBool Equal(const MxString& p_str) const { return strcmp(m_data, p_str.m_data) == 0; }
// FUNCTION: BETA10 0x1012a810
inline MxS8 Compare(const MxString& p_str) const { return strcmp(m_data, p_str.m_data); }
MxS8 Compare(const MxString& p_str) const { return strcmp(m_data, p_str.m_data); }
// SYNTHETIC: LEGO1 0x100ae280
// SYNTHETIC: BETA10 0x1012c9d0

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

@@ -19,7 +19,7 @@ public:
void Terminate();
void Sleep(MxS32 p_milliseconds);
inline MxBool IsRunning() { return m_running; }
MxBool IsRunning() { return m_running; }
// SYNTHETIC: LEGO1 0x100bf580
// MxThread::`scalar deleting destructor'

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

@@ -10,19 +10,19 @@ class MxTickleClient {
public:
MxTickleClient(MxCore* p_client, MxTime p_interval);
inline MxCore* GetClient() const { return m_client; }
MxCore* GetClient() const { return m_client; }
inline MxTime GetTickleInterval() const { return m_interval; }
MxTime GetTickleInterval() const { return m_interval; }
inline MxTime GetLastUpdateTime() const { return m_lastUpdateTime; }
MxTime GetLastUpdateTime() const { return m_lastUpdateTime; }
inline MxU16 GetFlags() const { return m_flags; }
MxU16 GetFlags() const { return m_flags; }
inline void SetTickleInterval(MxTime p_interval) { m_interval = p_interval; }
void SetTickleInterval(MxTime p_interval) { m_interval = p_interval; }
inline void SetLastUpdateTime(MxTime p_lastUpdateTime) { m_lastUpdateTime = p_lastUpdateTime; }
void SetLastUpdateTime(MxTime p_lastUpdateTime) { m_lastUpdateTime = p_lastUpdateTime; }
inline void SetFlags(MxU16 p_flags) { m_flags = p_flags; }
void SetFlags(MxU16 p_flags) { m_flags = p_flags; }
private:
MxCore* m_client; // 0x00
@@ -37,7 +37,7 @@ typedef list<MxTickleClient*> MxTickleClientPtrList;
// SIZE 0x14
class MxTickleManager : public MxCore {
public:
inline MxTickleManager() {}
MxTickleManager() {}
~MxTickleManager() override;
MxResult Tickle() override; // vtable+0x08

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

@@ -14,7 +14,7 @@ public:
MxLong GetRealTime();
inline MxLong GetTime()
MxLong GetTime()
{
if (this->m_isRunning) {
return g_lastTimeTimerStarted;

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

@@ -39,7 +39,7 @@ public:
virtual void Destroy() { delete this; } // vtable+0x08
// FUNCTION: BETA10 0x1012a7f0
inline const MxString* GetKey() const { return &m_key; }
const MxString* GetKey() const { return &m_key; }
protected:
MxString m_key; // 0x04

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

@@ -40,10 +40,10 @@ public:
void SortPresenterList();
void UpdateRegion();
inline MxVideoParam& GetVideoParam() { return this->m_videoParam; }
inline LPDIRECTDRAW GetDirectDraw() { return this->m_pDirectDraw; }
inline MxDisplaySurface* GetDisplaySurface() { return this->m_displaySurface; }
inline MxRegion* GetRegion() { return this->m_region; }
MxVideoParam& GetVideoParam() { return this->m_videoParam; }
LPDIRECTDRAW GetDirectDraw() { return this->m_pDirectDraw; }
MxDisplaySurface* GetDisplaySurface() { return this->m_displaySurface; }
MxRegion* GetRegion() { return this->m_region; }
// SYNTHETIC: LEGO1 0x100be280
// MxVideoManager::`scalar deleting destructor'

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

@@ -22,25 +22,25 @@ public:
MxVideoParam& operator=(const MxVideoParam& p_videoParam);
// FUNCTION: BETA10 0x100886e0
inline MxVideoParamFlags& Flags() { return m_flags; }
MxVideoParamFlags& Flags() { return m_flags; }
// FUNCTION: BETA10 0x100d81f0
inline MxRect32& GetRect() { return m_rect; }
MxRect32& GetRect() { return m_rect; }
// FUNCTION: BETA10 0x100d8210
inline MxPalette* GetPalette() { return m_palette; }
MxPalette* GetPalette() { return m_palette; }
// FUNCTION: BETA10 0x100d8240
inline void SetPalette(MxPalette* p_palette) { m_palette = p_palette; }
void SetPalette(MxPalette* p_palette) { m_palette = p_palette; }
// FUNCTION: BETA10 0x100d8270
inline char* GetDeviceName() { return m_deviceId; }
char* GetDeviceName() { return m_deviceId; }
// FUNCTION: BETA10 0x10141f60
inline MxU32 GetBackBuffers() { return m_backBuffers; }
MxU32 GetBackBuffers() { return m_backBuffers; }
// FUNCTION: BETA10 0x10141fe0
inline void SetBackBuffers(MxU32 p_backBuffers) { m_backBuffers = p_backBuffers; }
void SetBackBuffers(MxU32 p_backBuffers) { m_backBuffers = p_backBuffers; }
private:
MxRect32 m_rect; // 0x00

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

@@ -10,55 +10,55 @@ public:
MxVideoParamFlags();
// inlined in ISLE
inline void SetFullScreen(MxBool p_e) { m_flags1.m_bit0 = p_e; }
void SetFullScreen(MxBool p_e) { m_flags1.m_bit0 = p_e; }
// FUNCTION: BETA10 0x10141f80
inline void SetFlipSurfaces(MxBool p_e) { m_flags1.m_bit1 = p_e; }
void SetFlipSurfaces(MxBool p_e) { m_flags1.m_bit1 = p_e; }
// FUNCTION: BETA10 0x10141fb0
inline void SetBackBuffers(MxBool p_e) { m_flags1.m_bit2 = p_e; }
void SetBackBuffers(MxBool p_e) { m_flags1.m_bit2 = p_e; }
// FUNCTION: BETA10 0x100d9250
inline void SetF1bit3(MxBool p_e) { m_flags1.m_bit3 = p_e; }
void SetF1bit3(MxBool p_e) { m_flags1.m_bit3 = p_e; }
// inlined in ISLE
inline void Set16Bit(MxBool p_e) { m_flags1.m_bit5 = p_e; }
void Set16Bit(MxBool p_e) { m_flags1.m_bit5 = p_e; }
// inlined in ISLE
inline void SetWideViewAngle(MxBool p_e) { m_flags1.m_bit6 = p_e; }
void SetWideViewAngle(MxBool p_e) { m_flags1.m_bit6 = p_e; }
// inlined in ISLE
inline void SetF1bit7(MxBool p_e) { m_flags1.m_bit7 = p_e; }
void SetF1bit7(MxBool p_e) { m_flags1.m_bit7 = p_e; }
// FUNCTION: BETA10 0x100d81b0
inline void SetF2bit0(MxBool p_e) { m_flags2.m_bit0 = p_e; }
void SetF2bit0(MxBool p_e) { m_flags2.m_bit0 = p_e; }
// inlined in ISLE
inline void SetF2bit1(MxBool p_e) { m_flags2.m_bit1 = p_e; }
void SetF2bit1(MxBool p_e) { m_flags2.m_bit1 = p_e; }
// FUNCTION: BETA10 0x1009e770
inline MxBool GetFullScreen() { return m_flags1.m_bit0; }
MxBool GetFullScreen() { return m_flags1.m_bit0; }
// FUNCTION: BETA10 0x100d80f0
inline MxBool GetFlipSurfaces() { return m_flags1.m_bit1; }
MxBool GetFlipSurfaces() { return m_flags1.m_bit1; }
// FUNCTION: BETA10 0x100d8120
inline MxBool GetBackBuffers() { return m_flags1.m_bit2; }
MxBool GetBackBuffers() { return m_flags1.m_bit2; }
// FUNCTION: BETA10 0x10142010
inline MxBool GetF1bit3() { return m_flags1.m_bit3; }
MxBool GetF1bit3() { return m_flags1.m_bit3; }
// FUNCTION: BETA10 0x100d8150
inline MxBool Get16Bit() { return m_flags1.m_bit5; }
MxBool Get16Bit() { return m_flags1.m_bit5; }
// FUNCTION: BETA10 0x100d8180
inline MxBool GetWideViewAngle() { return m_flags1.m_bit6; }
MxBool GetWideViewAngle() { return m_flags1.m_bit6; }
// FUNCTION: BETA10 0x100886b0
inline MxBool GetF2bit0() { return m_flags2.m_bit0; }
MxBool GetF2bit0() { return m_flags2.m_bit0; }
// FUNCTION: BETA10 0x10142050
inline MxBool GetF2bit1() { return m_flags2.m_bit1; }
MxBool GetF2bit1() { return m_flags2.m_bit1; }
private:
FlagBitfield m_flags1;

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

@@ -26,13 +26,13 @@ public:
// FUNCTION: LEGO1 0x1000c820
// FUNCTION: BETA10 0x10055180
inline const char* ClassName() const override // vtable+0x0c
const char* ClassName() const override // vtable+0x0c
{
return HandlerClassName();
}
// FUNCTION: LEGO1 0x1000c830
inline MxBool IsA(const char* p_name) const override // vtable+0x10
MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, MxVideoPresenter::ClassName()) || MxMediaPresenter::IsA(p_name);
}
@@ -99,20 +99,20 @@ public:
};
inline MxS32 PrepareRects(RECT& p_rectDest, RECT& p_rectSrc);
inline MxBitmap* GetBitmap() { return m_frameBitmap; }
inline AlphaMask* GetAlphaMask() { return m_alpha; }
MxBitmap* GetBitmap() { return m_frameBitmap; }
AlphaMask* GetAlphaMask() { return m_alpha; }
inline void SetBit0(BOOL p_e) { m_flags.m_bit0 = p_e; }
inline void SetBit1(BOOL p_e) { m_flags.m_bit1 = p_e; }
inline void SetBit2(BOOL p_e) { m_flags.m_bit2 = p_e; }
inline void SetBit3(BOOL p_e) { m_flags.m_bit3 = p_e; }
inline void SetBit4(BOOL p_e) { m_flags.m_bit4 = p_e; }
void SetBit0(BOOL p_e) { m_flags.m_bit0 = p_e; }
void SetBit1(BOOL p_e) { m_flags.m_bit1 = p_e; }
void SetBit2(BOOL p_e) { m_flags.m_bit2 = p_e; }
void SetBit3(BOOL p_e) { m_flags.m_bit3 = p_e; }
void SetBit4(BOOL p_e) { m_flags.m_bit4 = p_e; }
inline BYTE GetBit0() { return m_flags.m_bit0; }
inline BYTE GetBit1() { return m_flags.m_bit1; }
inline BYTE GetBit2() { return m_flags.m_bit2; }
inline BYTE GetBit3() { return m_flags.m_bit3; }
inline BYTE GetBit4() { return m_flags.m_bit4; }
BYTE GetBit0() { return m_flags.m_bit0; }
BYTE GetBit1() { return m_flags.m_bit1; }
BYTE GetBit2() { return m_flags.m_bit2; }
BYTE GetBit3() { return m_flags.m_bit3; }
BYTE GetBit4() { return m_flags.m_bit4; }
// SYNTHETIC: LEGO1 0x1000c910
// MxVideoPresenter::`scalar deleting destructor'

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

@@ -24,13 +24,13 @@ public:
// FUNCTION: LEGO1 0x1000d6c0
// FUNCTION: BETA10 0x1008ccd0
inline const char* ClassName() const override // vtable+0x0c
const char* ClassName() const override // vtable+0x0c
{
return HandlerClassName();
}
// FUNCTION: LEGO1 0x1000d6d0
inline MxBool IsA(const char* p_name) const override // vtable+0x10
MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, MxWavePresenter::ClassName()) || MxSoundPresenter::IsA(p_name);
}