(clang-format) Add RemoveSemicolon (#506)

This commit is contained in:
Christian Semmler
2024-01-29 17:30:20 -05:00
committed by GitHub
parent bcdddd4c7e
commit baed704a38
39 changed files with 81 additions and 80 deletions

View File

@@ -30,6 +30,7 @@ QualifierOrder:
- const - const
- volatile - volatile
- type - type
RemoveSemicolon: true
SpaceAfterCStyleCast: true SpaceAfterCStyleCast: true
TabWidth: 4 TabWidth: 4
UseTab: ForContinuationAndIndentation UseTab: ForContinuationAndIndentation

View File

@@ -14,13 +14,13 @@ public:
{ {
// STRING: LEGO1 0x100f0154 // STRING: LEGO1 0x100f0154
return "Act1State"; return "Act1State";
}; }
// FUNCTION: LEGO1 0x100338b0 // FUNCTION: LEGO1 0x100338b0
inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10 inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
{ {
return !strcmp(p_name, Act1State::ClassName()) || LegoState::IsA(p_name); return !strcmp(p_name, Act1State::ClassName()) || LegoState::IsA(p_name);
}; }
virtual MxBool SetFlag() override; // vtable+0x18 virtual MxBool SetFlag() override; // vtable+0x18
virtual MxResult VTable0x1c(LegoFile* p_legoFile) override; // vtable+0x1c virtual MxResult VTable0x1c(LegoFile* p_legoFile) override; // vtable+0x1c

View File

@@ -76,7 +76,7 @@ protected:
// SIZE 0x24 // SIZE 0x24
class GifManager : public GifManagerBase { class GifManager : public GifManagerBase {
public: public:
GifManager() { m_ownership = TRUE; }; GifManager() { m_ownership = TRUE; }
virtual ~GifManager() override; virtual ~GifManager() override;
// SYNTHETIC: LEGO1 0x1005a580 // SYNTHETIC: LEGO1 0x1005a580

View File

@@ -22,14 +22,14 @@ public:
} }
// FUNCTION: LEGO1 0x1000e0b0 // FUNCTION: LEGO1 0x1000e0b0
virtual MxBool VTable0x14() override { return FALSE; }; // vtable+0x14 virtual MxBool VTable0x14() override { return FALSE; } // vtable+0x14
// FUNCTION: LEGO1 0x1000e0c0 // FUNCTION: LEGO1 0x1000e0c0
virtual MxBool SetFlag() override virtual MxBool SetFlag() override
{ {
m_unk0x08 = 0; m_unk0x08 = 0;
return TRUE; return TRUE;
}; // vtable+0x18 } // vtable+0x18
inline void SetUnknown8(MxU32 p_unk0x08) { m_unk0x08 = p_unk0x08; } inline void SetUnknown8(MxU32 p_unk0x08) { m_unk0x08 = p_unk0x08; }
inline MxU32 GetUnkown8() { return m_unk0x08; } inline MxU32 GetUnkown8() { return m_unk0x08; }

View File

@@ -10,7 +10,7 @@
class LegoActionControlPresenter : public MxMediaPresenter { class LegoActionControlPresenter : public MxMediaPresenter {
public: public:
inline LegoActionControlPresenter() { m_unk0x50 = Extra::ActionType::e_none; } inline LegoActionControlPresenter() { m_unk0x50 = Extra::ActionType::e_none; }
virtual ~LegoActionControlPresenter() override { Destroy(TRUE); }; // vtable+0x00 virtual ~LegoActionControlPresenter() override { Destroy(TRUE); } // vtable+0x00
// FUNCTION: LEGO1 0x1000d0e0 // FUNCTION: LEGO1 0x1000d0e0
inline virtual const char* ClassName() const override // vtable+0x0c inline virtual const char* ClassName() const override // vtable+0x0c

View File

@@ -25,7 +25,7 @@ public:
virtual MxS8 Compare(LegoCacheSound* p_a, LegoCacheSound* p_b) override virtual MxS8 Compare(LegoCacheSound* p_a, LegoCacheSound* p_b) override
{ {
return p_a == p_b ? 0 : p_a < p_b ? -1 : 1; return p_a == p_b ? 0 : p_a < p_b ? -1 : 1;
}; // vtable+0x14 } // vtable+0x14
}; };
// VTABLE: LEGO1 0x100d64a0 // VTABLE: LEGO1 0x100d64a0

View File

@@ -25,7 +25,7 @@ public:
virtual MxS8 Compare(LegoEntity* p_a, LegoEntity* p_b) override virtual MxS8 Compare(LegoEntity* p_a, LegoEntity* p_b) override
{ {
return p_a == p_b ? 0 : p_a < p_b ? -1 : 1; return p_a == p_b ? 0 : p_a < p_b ? -1 : 1;
}; // vtable+0x14 } // vtable+0x14
}; };
// VTABLE: LEGO1 0x100d64e8 // VTABLE: LEGO1 0x100d64e8

View File

@@ -18,7 +18,7 @@ public:
new LegoEventNotificationParam(m_type, m_sender, m_modifier, m_x, m_y, m_key); new LegoEventNotificationParam(m_type, m_sender, m_modifier, m_x, m_y, m_key);
clone->m_roi = m_roi; clone->m_roi = m_roi;
return clone; return clone;
}; // vtable+0x04 } // vtable+0x04
inline LegoEventNotificationParam() : MxNotificationParam(c_notificationType0, NULL) {} inline LegoEventNotificationParam() : MxNotificationParam(c_notificationType0, NULL) {}
inline LegoEventNotificationParam( inline LegoEventNotificationParam(

View File

@@ -78,7 +78,7 @@ public:
virtual MxResult Tickle() override; // vtable+0x08 virtual MxResult Tickle() override; // vtable+0x08
// FUNCTION: LEGO1 0x1005b8c0 // FUNCTION: LEGO1 0x1005b8c0
virtual MxResult PutData() override { return SUCCESS; }; // vtable+0x4c virtual MxResult PutData() override { return SUCCESS; } // vtable+0x4c
MxResult Create(HWND p_hwnd); MxResult Create(HWND p_hwnd);
void Destroy(); void Destroy();

View File

@@ -126,7 +126,7 @@ public:
inline void SetNavController(LegoNavController* p_navController) { m_navController = p_navController; } inline void SetNavController(LegoNavController* p_navController) { m_navController = p_navController; }
inline void SetWorld(LegoWorld* p_currentWorld) { m_currentWorld = p_currentWorld; } inline void SetWorld(LegoWorld* p_currentWorld) { m_currentWorld = p_currentWorld; }
inline void SetExit(MxBool p_exit) { m_exit = p_exit; }; inline void SetExit(MxBool p_exit) { m_exit = p_exit; }
inline void CloseMainWindow() { PostMessageA(m_windowHandle, WM_CLOSE, 0, 0); } inline void CloseMainWindow() { PostMessageA(m_windowHandle, WM_CLOSE, 0, 0); }

View File

@@ -8,7 +8,7 @@
class LegoPathController : public MxCore { class LegoPathController : public MxCore {
public: public:
LegoPathController(); LegoPathController();
virtual ~LegoPathController() override { Destroy(); }; virtual ~LegoPathController() override { Destroy(); }
virtual MxResult Tickle() override; // vtable+08 virtual MxResult Tickle() override; // vtable+08

View File

@@ -25,7 +25,7 @@ public:
virtual MxS8 Compare(LegoWorld* p_a, LegoWorld* p_b) override virtual MxS8 Compare(LegoWorld* p_a, LegoWorld* p_b) override
{ {
return p_a == p_b ? 0 : p_a < p_b ? -1 : 1; return p_a == p_b ? 0 : p_a < p_b ? -1 : 1;
}; // vtable+0x14 } // vtable+0x14
// SYNTHETIC: LEGO1 0x10059a00 // SYNTHETIC: LEGO1 0x10059a00
// LegoWorldList::`scalar deleting destructor' // LegoWorldList::`scalar deleting destructor'

View File

@@ -12,13 +12,13 @@ public:
{ {
// STRING: LEGO1 0x100f0084 // STRING: LEGO1 0x100f0084
return "ScoreState"; return "ScoreState";
}; }
// FUNCTION: LEGO1 0x1000de50 // FUNCTION: LEGO1 0x1000de50
inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10 inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
{ {
return !strcmp(p_name, ScoreState::ClassName()) || LegoState::IsA(p_name); return !strcmp(p_name, ScoreState::ClassName()) || LegoState::IsA(p_name);
}; }
virtual MxBool VTable0x14() override; // vtable+0x14 virtual MxBool VTable0x14() override; // vtable+0x14
virtual MxBool SetFlag() override; // vtable+0x18 virtual MxBool SetFlag() override; // vtable+0x18

View File

@@ -62,7 +62,7 @@ public:
DWORD GetZBufferBitDepth(MxAssignedDevice* p_assignedDevice); DWORD GetZBufferBitDepth(MxAssignedDevice* p_assignedDevice);
BOOL SetDevice(MxDeviceEnumerate& p_deviceEnumerate, MxDriver* p_driver, MxDevice* p_device); BOOL SetDevice(MxDeviceEnumerate& p_deviceEnumerate, MxDriver* p_driver, MxDevice* p_device);
inline MxAssignedDevice* GetAssignedDevice() { return this->m_assignedDevice; }; inline MxAssignedDevice* GetAssignedDevice() { return this->m_assignedDevice; }
inline IDirect3D2* GetDirect3D() { return this->m_pDirect3d; } inline IDirect3D2* GetDirect3D() { return this->m_pDirect3d; }
inline IDirect3DDevice2* GetDirect3DDevice() { return this->m_pDirect3dDevice; } inline IDirect3DDevice2* GetDirect3DDevice() { return this->m_pDirect3dDevice; }

View File

@@ -47,7 +47,7 @@ public:
virtual MxNotificationParam* Clone() override virtual MxNotificationParam* Clone() override
{ {
return new MxActionNotificationParam(this->m_type, this->m_sender, this->m_action, this->m_realloc); return new MxActionNotificationParam(this->m_type, this->m_sender, this->m_action, this->m_realloc);
}; // vtable+0x04 } // vtable+0x04
inline MxDSAction* GetAction() { return m_action; } inline MxDSAction* GetAction() { return m_action; }
@@ -96,7 +96,7 @@ public:
this->m_action, this->m_action,
this->m_realloc this->m_realloc
); );
}; // vtable+0x04 } // vtable+0x04
}; };
// VTABLE: LEGO1 0x100dc208 // VTABLE: LEGO1 0x100dc208

View File

@@ -25,8 +25,8 @@ public:
void Inc(); void Inc();
void Dec(); void Dec();
inline MxString* GetKey() { return &m_key; }; inline MxString* GetKey() { return &m_key; }
inline MxU16 GetValue() { return m_value; }; inline MxU16 GetValue() { return m_value; }
private: private:
MxString m_key; MxString m_key;

View File

@@ -15,7 +15,7 @@ public:
virtual void Destroy() override; // vtable+18 virtual void Destroy() override; // vtable+18
// FUNCTION: LEGO1 0x10029910 // FUNCTION: LEGO1 0x10029910
virtual MxS32 GetVolume() { return this->m_volume; }; // vtable+28 virtual MxS32 GetVolume() { return this->m_volume; } // vtable+28
virtual void SetVolume(MxS32 p_volume); // vtable+2c virtual void SetVolume(MxS32 p_volume); // vtable+2c

View File

@@ -24,10 +24,10 @@ public:
} }
// FUNCTION: LEGO1 0x1000d260 // FUNCTION: LEGO1 0x1000d260
virtual MxS32 GetVolume() { return m_volume; }; // vtable+0x5c virtual MxS32 GetVolume() { return m_volume; } // vtable+0x5c
// FUNCTION: LEGO1 0x1000d270 // FUNCTION: LEGO1 0x1000d270
virtual void SetVolume(MxS32 p_volume) { m_volume = p_volume; }; // vtable+0x60 virtual void SetVolume(MxS32 p_volume) { m_volume = p_volume; } // vtable+0x60
protected: protected:
MxS32 m_volume; MxS32 m_volume;

View File

@@ -44,7 +44,7 @@ public:
virtual MxLong Read(const char* p_filename); // vtable+24 virtual MxLong Read(const char* p_filename); // vtable+24
// FUNCTION: LEGO1 0x1004e0d0 // FUNCTION: LEGO1 0x1004e0d0
virtual int VTable0x28(int) { return -1; }; // vtable+28 virtual int VTable0x28(int) { return -1; } // vtable+28
virtual void BitBlt( virtual void BitBlt(
MxBitmap* p_src, MxBitmap* p_src,

View File

@@ -44,7 +44,7 @@ public:
if (m_compositePresenter) if (m_compositePresenter)
return m_compositePresenter->VTable0x64(p_undefined); return m_compositePresenter->VTable0x64(p_undefined);
return TRUE; return TRUE;
}; // vtable+0x64 } // vtable+0x64
protected: protected:
MxCompositePresenterList m_list; // 0x40 MxCompositePresenterList m_list; // 0x40

View File

@@ -17,7 +17,7 @@ public:
virtual MxLong Notify(MxParam& p_param); // vtable+04 virtual MxLong Notify(MxParam& p_param); // vtable+04
// FUNCTION: LEGO1 0x10001f70 // FUNCTION: LEGO1 0x10001f70
virtual MxResult Tickle() { return SUCCESS; }; // vtable+08 virtual MxResult Tickle() { return SUCCESS; } // vtable+08
// FUNCTION: LEGO1 0x100144c0 // FUNCTION: LEGO1 0x100144c0
inline virtual const char* ClassName() const // vtable+0c inline virtual const char* ClassName() const // vtable+0c

View File

@@ -36,7 +36,7 @@ public:
virtual MxBool HasId(MxU32 p_objectId) override; // vtable+34; virtual MxBool HasId(MxU32 p_objectId) override; // vtable+34;
virtual void SetUnknown90(MxLong p_unk0x90) override; // vtable+38; virtual void SetUnknown90(MxLong p_unk0x90) override; // vtable+38;
inline MxDSActionList* GetActionList() const { return m_actions; }; inline MxDSActionList* GetActionList() const { return m_actions; }
// SYNTHETIC: LEGO1 0x100ca040 // SYNTHETIC: LEGO1 0x100ca040
// MxDSMultiAction::`scalar deleting destructor' // MxDSMultiAction::`scalar deleting destructor'

View File

@@ -36,13 +36,13 @@ public:
void SetSourceName(const char* p_sourceName); void SetSourceName(const char* p_sourceName);
// FUNCTION: LEGO1 0x100bf730 // FUNCTION: LEGO1 0x100bf730
inline virtual const char* ClassName() const override { return "MxDSObject"; }; // vtable+0c inline virtual const char* ClassName() const override { return "MxDSObject"; } // vtable+0c
// FUNCTION: LEGO1 0x100bf740 // FUNCTION: LEGO1 0x100bf740
inline virtual MxBool IsA(const char* p_name) const override inline virtual MxBool IsA(const char* p_name) const override
{ {
return !strcmp(p_name, MxDSObject::ClassName()) || MxCore::IsA(p_name); return !strcmp(p_name, MxDSObject::ClassName()) || MxCore::IsA(p_name);
}; // vtable+10; } // vtable+10;
virtual undefined4 VTable0x14(); // vtable+14; virtual undefined4 VTable0x14(); // vtable+14;
virtual MxU32 GetSizeOnDisk(); // vtable+18; virtual MxU32 GetSizeOnDisk(); // vtable+18;

View File

@@ -36,7 +36,7 @@ public:
this->m_mxEntityId = p_id; this->m_mxEntityId = p_id;
this->m_atom = p_atom; this->m_atom = p_atom;
return SUCCESS; return SUCCESS;
}; // vtable+0x14 } // vtable+0x14
inline MxResult Create(MxDSAction& p_dsAction) inline MxResult Create(MxDSAction& p_dsAction)
{ {

View File

@@ -53,8 +53,8 @@ public:
virtual ~MxList() override; virtual ~MxList() override;
void Append(T p_obj) { InsertEntry(p_obj, this->m_last, NULL); }; void Append(T p_obj) { InsertEntry(p_obj, this->m_last, NULL); }
void Prepend(T p_obj) { InsertEntry(p_obj, NULL, this->m_first); }; void Prepend(T p_obj) { InsertEntry(p_obj, NULL, this->m_first); }
void DeleteAll(MxBool p_destroy = TRUE); void DeleteAll(MxBool p_destroy = TRUE);
MxU32 GetCount() { return this->m_count; } MxU32 GetCount() { return this->m_count; }
@@ -75,7 +75,7 @@ class MxPtrList : public MxList<T*> {
public: public:
MxPtrList(MxBool p_ownership) { SetOwnership(p_ownership); } MxPtrList(MxBool p_ownership) { SetOwnership(p_ownership); }
static void Destroy(T* p_obj) { delete p_obj; }; static void Destroy(T* p_obj) { delete p_obj; }
void SetOwnership(MxBool p_ownership) void SetOwnership(MxBool p_ownership)
{ {

View File

@@ -13,7 +13,7 @@ public:
inline MxMediaPresenter() { Init(); } inline MxMediaPresenter() { Init(); }
// FUNCTION: LEGO1 0x1000c550 // FUNCTION: LEGO1 0x1000c550
virtual ~MxMediaPresenter() override { Destroy(TRUE); }; virtual ~MxMediaPresenter() override { Destroy(TRUE); }
virtual MxResult Tickle() override; // vtable+0x08 virtual MxResult Tickle() override; // vtable+0x08
@@ -35,7 +35,7 @@ public:
virtual void DoneTickle() override; // vtable+0x2c virtual void DoneTickle() override; // vtable+0x2c
// FUNCTION: LEGO1 0x1000c5b0 // FUNCTION: LEGO1 0x1000c5b0
virtual void Destroy() override { Destroy(FALSE); }; // vtable+0x38 virtual void Destroy() override { Destroy(FALSE); } // vtable+0x38
virtual MxResult StartAction(MxStreamController*, MxDSAction*) override; // vtable+0x3c virtual MxResult StartAction(MxStreamController*, MxDSAction*) override; // vtable+0x3c
virtual void EndAction() override; // vtable+0x40 virtual void EndAction() override; // vtable+0x40

View File

@@ -42,7 +42,7 @@ public:
} }
// FUNCTION: LEGO1 0x10010390 // FUNCTION: LEGO1 0x10010390
virtual MxNotificationParam* Clone() { return new MxNotificationParam(m_type, m_sender); }; // vtable+0x04 virtual MxNotificationParam* Clone() { return new MxNotificationParam(m_type, m_sender); } // vtable+0x04
inline NotificationId GetNotification() const { return m_type; } inline NotificationId GetNotification() const { return m_type; }
inline MxCore* GetSender() const { return m_sender; } inline MxCore* GetSender() const { return m_sender; }

View File

@@ -54,7 +54,7 @@ public:
virtual void StopTimer(); // vtable+3c virtual void StopTimer(); // vtable+3c
// FUNCTION: LEGO1 0x10058a90 // FUNCTION: LEGO1 0x10058a90
virtual MxBool IsTimerRunning() { return m_timerRunning; }; // vtable+40 virtual MxBool IsTimerRunning() { return m_timerRunning; } // vtable+40
static void SetInstance(MxOmni* p_instance); static void SetInstance(MxOmni* p_instance);
static MxBool ActionSourceEquals(MxDSAction* p_action, const char* p_name); static MxBool ActionSourceEquals(MxDSAction* p_action, const char* p_name);

View File

@@ -60,17 +60,17 @@ public:
virtual void StartingTickle() { ProgressTickleState(e_streaming); } // vtable+0x1c virtual void StartingTickle() { ProgressTickleState(e_streaming); } // vtable+0x1c
// FUNCTION: LEGO1 0x1000be80 // FUNCTION: LEGO1 0x1000be80
virtual void StreamingTickle() { ProgressTickleState(e_repeating); }; // vtable+0x20 virtual void StreamingTickle() { ProgressTickleState(e_repeating); } // vtable+0x20
// FUNCTION: LEGO1 0x1000bea0 // FUNCTION: LEGO1 0x1000bea0
virtual void RepeatingTickle() { ProgressTickleState(e_unk5); }; // vtable+0x24 virtual void RepeatingTickle() { ProgressTickleState(e_unk5); } // vtable+0x24
// FUNCTION: LEGO1 0x1000bec0 // FUNCTION: LEGO1 0x1000bec0
virtual void Unk5Tickle() { ProgressTickleState(e_done); }; // vtable+0x28 virtual void Unk5Tickle() { ProgressTickleState(e_done); } // vtable+0x28
protected: protected:
// FUNCTION: LEGO1 0x1000bee0 // FUNCTION: LEGO1 0x1000bee0
virtual void DoneTickle() { ProgressTickleState(e_idle); }; // vtable+0x2c virtual void DoneTickle() { ProgressTickleState(e_idle); } // vtable+0x2c
virtual void ParseExtra(); // vtable+0x30 virtual void ParseExtra(); // vtable+0x30
@@ -82,10 +82,10 @@ protected:
public: public:
// FUNCTION: LEGO1 0x1000bf70 // FUNCTION: LEGO1 0x1000bf70
virtual MxResult AddToManager() { return SUCCESS; }; // vtable+0x34 virtual MxResult AddToManager() { return SUCCESS; } // vtable+0x34
// FUNCTION: LEGO1 0x1000bf80 // FUNCTION: LEGO1 0x1000bf80
virtual void Destroy() { Init(); }; // vtable+0x38 virtual void Destroy() { Init(); } // vtable+0x38
virtual MxResult StartAction(MxStreamController*, MxDSAction*); // vtable+0x3c virtual MxResult StartAction(MxStreamController*, MxDSAction*); // vtable+0x3c
virtual void EndAction(); // vtable+0x40 virtual void EndAction(); // vtable+0x40
@@ -97,13 +97,13 @@ public:
virtual MxBool HasTickleStatePassed(TickleState p_tickleState) virtual MxBool HasTickleStatePassed(TickleState p_tickleState)
{ {
return m_previousTickleStates & (1 << (MxU8) p_tickleState); return m_previousTickleStates & (1 << (MxU8) p_tickleState);
}; // vtable+0x48 } // vtable+0x48
// FUNCTION: LEGO1 0x1000bfc0 // FUNCTION: LEGO1 0x1000bfc0
virtual MxResult PutData() { return SUCCESS; }; // vtable+0x4c virtual MxResult PutData() { return SUCCESS; } // vtable+0x4c
// FUNCTION: LEGO1 0x1000bfd0 // FUNCTION: LEGO1 0x1000bfd0
virtual MxBool IsHit(MxS32 p_x, MxS32 p_y) { return FALSE; }; // vtable+0x50 virtual MxBool IsHit(MxS32 p_x, MxS32 p_y) { return FALSE; } // vtable+0x50
virtual void Enable(MxBool p_enable); // vtable+0x54 virtual void Enable(MxBool p_enable); // vtable+0x54

View File

@@ -17,7 +17,7 @@ public:
virtual MxS8 Compare(MxPresenter* p_a, MxPresenter* p_b) override virtual MxS8 Compare(MxPresenter* p_a, MxPresenter* p_b) override
{ {
return p_a == p_b ? 0 : p_a < p_b ? -1 : 1; return p_a == p_b ? 0 : p_a < p_b ? -1 : 1;
}; // vtable+0x14 } // vtable+0x14
// SYNTHETIC: LEGO1 0x1001ceb0 // SYNTHETIC: LEGO1 0x1001ceb0
// MxPresenterList::`scalar deleting destructor' // MxPresenterList::`scalar deleting destructor'

View File

@@ -114,8 +114,8 @@ private:
return this; return this;
} }
inline static MxS32 Min(MxS32 p_a, MxS32 p_b) { return p_a <= p_b ? p_a : p_b; }; 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; }; inline static MxS32 Max(MxS32 p_a, MxS32 p_b) { return p_a <= p_b ? p_b : p_a; }
MxS32 m_left; // 0x00 MxS32 m_left; // 0x00
MxS32 m_top; // 0x04 MxS32 m_top; // 0x04

View File

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

View File

@@ -11,7 +11,7 @@ public:
MxStillPresenter() { m_bitmapInfo = NULL; } MxStillPresenter() { m_bitmapInfo = NULL; }
// FUNCTION: LEGO1 0x10043550 // FUNCTION: LEGO1 0x10043550
virtual ~MxStillPresenter() override { Destroy(TRUE); }; // vtable+0x00 virtual ~MxStillPresenter() override { Destroy(TRUE); } // vtable+0x00
// FUNCTION: LEGO1 0x100435c0 // FUNCTION: LEGO1 0x100435c0
inline virtual const char* ClassName() const override // vtable+0x0c inline virtual const char* ClassName() const override // vtable+0x0c
@@ -32,7 +32,7 @@ public:
virtual void ParseExtra() override; // vtable+0x30 virtual void ParseExtra() override; // vtable+0x30
// FUNCTION: LEGO1 0x100435b0 // FUNCTION: LEGO1 0x100435b0
virtual void Destroy() override { Destroy(FALSE); }; // vtable+0x38 virtual void Destroy() override { Destroy(FALSE); } // vtable+0x38
virtual void Enable(MxBool p_enable) override; // vtable+0x54 virtual void Enable(MxBool p_enable) override; // vtable+0x54
virtual void LoadHeader(MxStreamChunk* p_chunk) override; // vtable+0x5c virtual void LoadHeader(MxStreamChunk* p_chunk) override; // vtable+0x5c

View File

@@ -53,11 +53,11 @@ public:
MxResult InsertActionToList54(MxDSAction* p_action); MxResult InsertActionToList54(MxDSAction* p_action);
MxNextActionDataStart* FindNextActionDataStartFromStreamingAction(MxDSStreamingAction* p_action); MxNextActionDataStart* FindNextActionDataStartFromStreamingAction(MxDSStreamingAction* p_action);
inline MxAtomId& GetAtom() { return m_atom; }; inline MxAtomId& GetAtom() { return m_atom; }
inline MxStreamProvider* GetProvider() { return m_provider; }; inline MxStreamProvider* GetProvider() { return m_provider; }
inline MxStreamListMxDSAction& GetUnk0x3c() { return m_unk0x3c; }; inline MxStreamListMxDSAction& GetUnk0x3c() { return m_unk0x3c; }
inline MxStreamListMxDSAction& GetUnk0x54() { return m_unk0x54; }; inline MxStreamListMxDSAction& GetUnk0x54() { return m_unk0x54; }
inline MxStreamListMxDSSubscriber& GetSubscriberList() { return m_subscriberList; }; inline MxStreamListMxDSSubscriber& GetSubscriberList() { return m_subscriberList; }
protected: protected:
MxCriticalSection m_criticalSection; // 0x08 MxCriticalSection m_criticalSection; // 0x08

View File

@@ -22,13 +22,13 @@ public:
} }
// FUNCTION: LEGO1 0x1003bea0 // FUNCTION: LEGO1 0x1003bea0
virtual MxString* GetValue() { return &m_value; }; virtual MxString* GetValue() { return &m_value; }
// FUNCTION: LEGO1 0x1003beb0 // FUNCTION: LEGO1 0x1003beb0
virtual void SetValue(const char* p_value) { m_value = p_value; }; virtual void SetValue(const char* p_value) { m_value = p_value; }
// FUNCTION: LEGO1 0x1003bec0 // FUNCTION: LEGO1 0x1003bec0
virtual void Destroy() { delete this; }; virtual void Destroy() { delete this; }
inline const MxString* GetKey() const { return &m_key; } inline const MxString* GetKey() const { return &m_key; }

View File

@@ -13,7 +13,7 @@ public:
MxVideoPresenter() { Init(); } MxVideoPresenter() { Init(); }
// FUNCTION: LEGO1 0x1000c740 // FUNCTION: LEGO1 0x1000c740
virtual ~MxVideoPresenter() override { Destroy(TRUE); }; // vtable+0x00 virtual ~MxVideoPresenter() override { Destroy(TRUE); } // vtable+0x00
// FUNCTION: LEGO1 0x1000c820 // FUNCTION: LEGO1 0x1000c820
inline virtual const char* ClassName() const override // vtable+0x0c inline virtual const char* ClassName() const override // vtable+0x0c
@@ -36,7 +36,7 @@ public:
virtual MxResult AddToManager() override; // vtable+0x34 virtual MxResult AddToManager() override; // vtable+0x34
// FUNCTION: LEGO1 0x1000c7a0 // FUNCTION: LEGO1 0x1000c7a0
virtual void Destroy() override { Destroy(FALSE); }; // vtable+0x38 virtual void Destroy() override { Destroy(FALSE); } // vtable+0x38
virtual void EndAction() override; // vtable+0x40 virtual void EndAction() override; // vtable+0x40
virtual MxResult PutData() override; // vtable+0x4c virtual MxResult PutData() override; // vtable+0x4c
@@ -61,16 +61,16 @@ public:
virtual undefined VTable0x74(); // vtable+0x74 virtual undefined VTable0x74(); // vtable+0x74
// FUNCTION: LEGO1 0x1000c7b0 // FUNCTION: LEGO1 0x1000c7b0
virtual LPDIRECTDRAWSURFACE VTable0x78() { return m_unk0x58; }; // vtable+0x78 virtual LPDIRECTDRAWSURFACE VTable0x78() { return m_unk0x58; } // vtable+0x78
// FUNCTION: LEGO1 0x1000c7c0 // FUNCTION: LEGO1 0x1000c7c0
virtual MxBool VTable0x7c() { return (m_bitmap != NULL) || (m_alpha != NULL); }; // vtable+0x7c virtual MxBool VTable0x7c() { return (m_bitmap != NULL) || (m_alpha != NULL); } // vtable+0x7c
// FUNCTION: LEGO1 0x1000c7e0 // FUNCTION: LEGO1 0x1000c7e0
virtual MxS32 GetWidth() { return m_alpha ? m_alpha->m_width : m_bitmap->GetBmiWidth(); }; // vtable+0x80 virtual MxS32 GetWidth() { return m_alpha ? m_alpha->m_width : m_bitmap->GetBmiWidth(); } // vtable+0x80
// FUNCTION: LEGO1 0x1000c800 // FUNCTION: LEGO1 0x1000c800
virtual MxS32 GetHeight() { return m_alpha ? m_alpha->m_height : m_bitmap->GetBmiHeightAbs(); }; // vtable+0x84 virtual MxS32 GetHeight() { return m_alpha ? m_alpha->m_height : m_bitmap->GetBmiHeightAbs(); } // vtable+0x84
// VTABLE: LEGO1 0x100dc2bc // VTABLE: LEGO1 0x100dc2bc
// SIZE 0x0c // SIZE 0x0c

View File

@@ -13,7 +13,7 @@ public:
MxWavePresenter() { Init(); } MxWavePresenter() { Init(); }
// FUNCTION: LEGO1 0x1000d640 // FUNCTION: LEGO1 0x1000d640
virtual ~MxWavePresenter() override { Destroy(TRUE); }; // vtable+0x00 virtual ~MxWavePresenter() override { Destroy(TRUE); } // vtable+0x00
// FUNCTION: LEGO1 0x1000d6c0 // FUNCTION: LEGO1 0x1000d6c0
inline virtual const char* ClassName() const override // vtable+0x0c inline virtual const char* ClassName() const override // vtable+0x0c
@@ -36,7 +36,7 @@ public:
virtual MxResult AddToManager() override; // vtable+0x34 virtual MxResult AddToManager() override; // vtable+0x34
// FUNCTION: LEGO1 0x1000d6a0 // FUNCTION: LEGO1 0x1000d6a0
virtual void Destroy() override { Destroy(FALSE); }; // vtable+0x38 virtual void Destroy() override { Destroy(FALSE); } // vtable+0x38
virtual void EndAction() override; // vtable+0x40 virtual void EndAction() override; // vtable+0x40
virtual MxResult PutData() override; // vtable+0x4c virtual MxResult PutData() override; // vtable+0x4c
@@ -47,7 +47,7 @@ public:
virtual void Resume(); // vtable+0x68 virtual void Resume(); // vtable+0x68
// FUNCTION: LEGO1 0x1000d6b0 // FUNCTION: LEGO1 0x1000d6b0
virtual MxBool IsPaused() { return m_paused; }; // vtable+0x6c virtual MxBool IsPaused() { return m_paused; } // vtable+0x6c
// SIZE 0x18 // SIZE 0x18
struct WaveFormat { struct WaveFormat {

View File

@@ -25,28 +25,28 @@ public:
virtual void Equals(const Matrix4& p_matrix) virtual void Equals(const Matrix4& p_matrix)
{ {
memcpy(m_data, p_matrix.m_data, sizeof(float) * 4 * 4); memcpy(m_data, p_matrix.m_data, sizeof(float) * 4 * 4);
}; // vtable+0x00 } // vtable+0x00
// FUNCTION: LEGO1 0x10002360 // FUNCTION: LEGO1 0x10002360
virtual void SetData(float (*p_data)[4]) { m_data = p_data; } // vtable+0x0c virtual void SetData(float (*p_data)[4]) { m_data = p_data; } // vtable+0x0c
// FUNCTION: LEGO1 0x10002370 // FUNCTION: LEGO1 0x10002370
virtual void SetData(UnknownMatrixType& p_matrix) { m_data = p_matrix.m_data; }; // vtable+0x08 virtual void SetData(UnknownMatrixType& p_matrix) { m_data = p_matrix.m_data; } // vtable+0x08
// FUNCTION: LEGO1 0x10002380 // FUNCTION: LEGO1 0x10002380
virtual float (*GetData())[4] { return m_data; }; // vtable+0x14 virtual float (*GetData())[4] { return m_data; } // vtable+0x14
// FUNCTION: LEGO1 0x10002390 // FUNCTION: LEGO1 0x10002390
virtual float (*GetData() const)[4] { return m_data; }; // vtable+0x10 virtual float (*GetData() const)[4] { return m_data; } // vtable+0x10
// FUNCTION: LEGO1 0x100023a0 // FUNCTION: LEGO1 0x100023a0
virtual float* Element(int p_row, int p_col) { return &m_data[p_row][p_col]; } // vtable+0x1c virtual float* Element(int p_row, int p_col) { return &m_data[p_row][p_col]; } // vtable+0x1c
// FUNCTION: LEGO1 0x100023c0 // FUNCTION: LEGO1 0x100023c0
virtual const float* Element(int p_row, int p_col) const { return &m_data[p_row][p_col]; }; // vtable+0x18 virtual const float* Element(int p_row, int p_col) const { return &m_data[p_row][p_col]; } // vtable+0x18
// FUNCTION: LEGO1 0x100023e0 // FUNCTION: LEGO1 0x100023e0
virtual void Clear() { memset(m_data, 0, 16 * sizeof(float)); }; // vtable+0x20 virtual void Clear() { memset(m_data, 0, 16 * sizeof(float)); } // vtable+0x20
// FUNCTION: LEGO1 0x100023f0 // FUNCTION: LEGO1 0x100023f0
virtual void SetIdentity() virtual void SetIdentity()
@@ -98,7 +98,7 @@ public:
cur++; cur++;
} }
} }
}; // vtable+0x3c } // vtable+0x3c
// FUNCTION: LEGO1 0x10002530 // FUNCTION: LEGO1 0x10002530
virtual void Product(const Matrix4& p_a, const Matrix4& p_b) { Product(p_a.m_data, p_b.m_data); } // vtable+0x38 virtual void Product(const Matrix4& p_a, const Matrix4& p_b) { Product(p_a.m_data, p_b.m_data); } // vtable+0x38

View File

@@ -40,7 +40,7 @@ class UnkImpl;
class RendererImpl : public Renderer { class RendererImpl : public Renderer {
public: public:
RendererImpl() : m_data(0) {} RendererImpl() : m_data(0) {}
~RendererImpl() { Destroy(); }; ~RendererImpl() { Destroy(); }
virtual void* ImplementationDataPtr() override; virtual void* ImplementationDataPtr() override;