From baed704a384350b69dac0afe613174a15869c0c2 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Mon, 29 Jan 2024 17:30:20 -0500
Subject: [PATCH] (clang-format) Add RemoveSemicolon (#506)
---
.clang-format | 1 +
LEGO1/lego/legoomni/include/act1state.h | 4 ++--
LEGO1/lego/legoomni/include/gifmanager.h | 2 +-
LEGO1/lego/legoomni/include/helicopterstate.h | 4 ++--
.../include/legoactioncontrolpresenter.h | 2 +-
.../lego/legoomni/include/legocachesoundlist.h | 2 +-
LEGO1/lego/legoomni/include/legoentitylist.h | 2 +-
.../include/legoeventnotificationparam.h | 2 +-
LEGO1/lego/legoomni/include/legoinputmanager.h | 2 +-
LEGO1/lego/legoomni/include/legoomni.h | 2 +-
.../lego/legoomni/include/legopathcontroller.h | 2 +-
LEGO1/lego/legoomni/include/legoworldlist.h | 2 +-
LEGO1/lego/legoomni/include/scorestate.h | 4 ++--
LEGO1/mxdirectx/mxdirect3d.h | 2 +-
LEGO1/omni/include/mxactionnotificationparam.h | 4 ++--
LEGO1/omni/include/mxatomidcounter.h | 4 ++--
LEGO1/omni/include/mxaudiomanager.h | 2 +-
LEGO1/omni/include/mxaudiopresenter.h | 4 ++--
LEGO1/omni/include/mxbitmap.h | 2 +-
LEGO1/omni/include/mxcompositepresenter.h | 2 +-
LEGO1/omni/include/mxcore.h | 2 +-
LEGO1/omni/include/mxdsmultiaction.h | 2 +-
LEGO1/omni/include/mxdsobject.h | 4 ++--
LEGO1/omni/include/mxentity.h | 2 +-
LEGO1/omni/include/mxlist.h | 6 +++---
LEGO1/omni/include/mxmediapresenter.h | 4 ++--
LEGO1/omni/include/mxnotificationparam.h | 2 +-
LEGO1/omni/include/mxomni.h | 2 +-
LEGO1/omni/include/mxpresenter.h | 18 +++++++++---------
LEGO1/omni/include/mxpresenterlist.h | 2 +-
LEGO1/omni/include/mxrect32.h | 4 ++--
LEGO1/omni/include/mxsoundpresenter.h | 8 ++++----
LEGO1/omni/include/mxstillpresenter.h | 4 ++--
LEGO1/omni/include/mxstreamcontroller.h | 10 +++++-----
LEGO1/omni/include/mxvariable.h | 6 +++---
LEGO1/omni/include/mxvideopresenter.h | 12 ++++++------
LEGO1/omni/include/mxwavepresenter.h | 6 +++---
LEGO1/realtime/matrix.h | 14 +++++++-------
LEGO1/tgl/d3drm/impl.h | 2 +-
39 files changed, 81 insertions(+), 80 deletions(-)
diff --git a/.clang-format b/.clang-format
index 19e35762..5d97094c 100644
--- a/.clang-format
+++ b/.clang-format
@@ -30,6 +30,7 @@ QualifierOrder:
- const
- volatile
- type
+RemoveSemicolon: true
SpaceAfterCStyleCast: true
TabWidth: 4
UseTab: ForContinuationAndIndentation
diff --git a/LEGO1/lego/legoomni/include/act1state.h b/LEGO1/lego/legoomni/include/act1state.h
index 62cbf98c..324d7195 100644
--- a/LEGO1/lego/legoomni/include/act1state.h
+++ b/LEGO1/lego/legoomni/include/act1state.h
@@ -14,13 +14,13 @@ public:
{
// STRING: LEGO1 0x100f0154
return "Act1State";
- };
+ }
// FUNCTION: LEGO1 0x100338b0
inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, Act1State::ClassName()) || LegoState::IsA(p_name);
- };
+ }
virtual MxBool SetFlag() override; // vtable+0x18
virtual MxResult VTable0x1c(LegoFile* p_legoFile) override; // vtable+0x1c
diff --git a/LEGO1/lego/legoomni/include/gifmanager.h b/LEGO1/lego/legoomni/include/gifmanager.h
index 898ab1fb..1d424fb7 100644
--- a/LEGO1/lego/legoomni/include/gifmanager.h
+++ b/LEGO1/lego/legoomni/include/gifmanager.h
@@ -76,7 +76,7 @@ protected:
// SIZE 0x24
class GifManager : public GifManagerBase {
public:
- GifManager() { m_ownership = TRUE; };
+ GifManager() { m_ownership = TRUE; }
virtual ~GifManager() override;
// SYNTHETIC: LEGO1 0x1005a580
diff --git a/LEGO1/lego/legoomni/include/helicopterstate.h b/LEGO1/lego/legoomni/include/helicopterstate.h
index 186469ff..a1562157 100644
--- a/LEGO1/lego/legoomni/include/helicopterstate.h
+++ b/LEGO1/lego/legoomni/include/helicopterstate.h
@@ -22,14 +22,14 @@ public:
}
// FUNCTION: LEGO1 0x1000e0b0
- virtual MxBool VTable0x14() override { return FALSE; }; // vtable+0x14
+ virtual MxBool VTable0x14() override { return FALSE; } // vtable+0x14
// FUNCTION: LEGO1 0x1000e0c0
virtual MxBool SetFlag() override
{
m_unk0x08 = 0;
return TRUE;
- }; // vtable+0x18
+ } // vtable+0x18
inline void SetUnknown8(MxU32 p_unk0x08) { m_unk0x08 = p_unk0x08; }
inline MxU32 GetUnkown8() { return m_unk0x08; }
diff --git a/LEGO1/lego/legoomni/include/legoactioncontrolpresenter.h b/LEGO1/lego/legoomni/include/legoactioncontrolpresenter.h
index 0cc18935..633fc5eb 100644
--- a/LEGO1/lego/legoomni/include/legoactioncontrolpresenter.h
+++ b/LEGO1/lego/legoomni/include/legoactioncontrolpresenter.h
@@ -10,7 +10,7 @@
class LegoActionControlPresenter : public MxMediaPresenter {
public:
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
inline virtual const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/lego/legoomni/include/legocachesoundlist.h b/LEGO1/lego/legoomni/include/legocachesoundlist.h
index c97d578f..2080ae14 100644
--- a/LEGO1/lego/legoomni/include/legocachesoundlist.h
+++ b/LEGO1/lego/legoomni/include/legocachesoundlist.h
@@ -25,7 +25,7 @@ public:
virtual MxS8 Compare(LegoCacheSound* p_a, LegoCacheSound* p_b) override
{
return p_a == p_b ? 0 : p_a < p_b ? -1 : 1;
- }; // vtable+0x14
+ } // vtable+0x14
};
// VTABLE: LEGO1 0x100d64a0
diff --git a/LEGO1/lego/legoomni/include/legoentitylist.h b/LEGO1/lego/legoomni/include/legoentitylist.h
index aa691da8..d1c1383f 100644
--- a/LEGO1/lego/legoomni/include/legoentitylist.h
+++ b/LEGO1/lego/legoomni/include/legoentitylist.h
@@ -25,7 +25,7 @@ public:
virtual MxS8 Compare(LegoEntity* p_a, LegoEntity* p_b) override
{
return p_a == p_b ? 0 : p_a < p_b ? -1 : 1;
- }; // vtable+0x14
+ } // vtable+0x14
};
// VTABLE: LEGO1 0x100d64e8
diff --git a/LEGO1/lego/legoomni/include/legoeventnotificationparam.h b/LEGO1/lego/legoomni/include/legoeventnotificationparam.h
index fea26d46..650ef8f6 100644
--- a/LEGO1/lego/legoomni/include/legoeventnotificationparam.h
+++ b/LEGO1/lego/legoomni/include/legoeventnotificationparam.h
@@ -18,7 +18,7 @@ public:
new LegoEventNotificationParam(m_type, m_sender, m_modifier, m_x, m_y, m_key);
clone->m_roi = m_roi;
return clone;
- }; // vtable+0x04
+ } // vtable+0x04
inline LegoEventNotificationParam() : MxNotificationParam(c_notificationType0, NULL) {}
inline LegoEventNotificationParam(
diff --git a/LEGO1/lego/legoomni/include/legoinputmanager.h b/LEGO1/lego/legoomni/include/legoinputmanager.h
index cd9b9d0d..e872eff6 100644
--- a/LEGO1/lego/legoomni/include/legoinputmanager.h
+++ b/LEGO1/lego/legoomni/include/legoinputmanager.h
@@ -78,7 +78,7 @@ public:
virtual MxResult Tickle() override; // vtable+0x08
// FUNCTION: LEGO1 0x1005b8c0
- virtual MxResult PutData() override { return SUCCESS; }; // vtable+0x4c
+ virtual MxResult PutData() override { return SUCCESS; } // vtable+0x4c
MxResult Create(HWND p_hwnd);
void Destroy();
diff --git a/LEGO1/lego/legoomni/include/legoomni.h b/LEGO1/lego/legoomni/include/legoomni.h
index 7a8ee7f0..f27bf140 100644
--- a/LEGO1/lego/legoomni/include/legoomni.h
+++ b/LEGO1/lego/legoomni/include/legoomni.h
@@ -126,7 +126,7 @@ public:
inline void SetNavController(LegoNavController* p_navController) { m_navController = p_navController; }
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); }
diff --git a/LEGO1/lego/legoomni/include/legopathcontroller.h b/LEGO1/lego/legoomni/include/legopathcontroller.h
index d4c7163b..86298726 100644
--- a/LEGO1/lego/legoomni/include/legopathcontroller.h
+++ b/LEGO1/lego/legoomni/include/legopathcontroller.h
@@ -8,7 +8,7 @@
class LegoPathController : public MxCore {
public:
LegoPathController();
- virtual ~LegoPathController() override { Destroy(); };
+ virtual ~LegoPathController() override { Destroy(); }
virtual MxResult Tickle() override; // vtable+08
diff --git a/LEGO1/lego/legoomni/include/legoworldlist.h b/LEGO1/lego/legoomni/include/legoworldlist.h
index 64849968..6467859c 100644
--- a/LEGO1/lego/legoomni/include/legoworldlist.h
+++ b/LEGO1/lego/legoomni/include/legoworldlist.h
@@ -25,7 +25,7 @@ public:
virtual MxS8 Compare(LegoWorld* p_a, LegoWorld* p_b) override
{
return p_a == p_b ? 0 : p_a < p_b ? -1 : 1;
- }; // vtable+0x14
+ } // vtable+0x14
// SYNTHETIC: LEGO1 0x10059a00
// LegoWorldList::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/scorestate.h b/LEGO1/lego/legoomni/include/scorestate.h
index 5bc45c70..e02c2e56 100644
--- a/LEGO1/lego/legoomni/include/scorestate.h
+++ b/LEGO1/lego/legoomni/include/scorestate.h
@@ -12,13 +12,13 @@ public:
{
// STRING: LEGO1 0x100f0084
return "ScoreState";
- };
+ }
// FUNCTION: LEGO1 0x1000de50
inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, ScoreState::ClassName()) || LegoState::IsA(p_name);
- };
+ }
virtual MxBool VTable0x14() override; // vtable+0x14
virtual MxBool SetFlag() override; // vtable+0x18
diff --git a/LEGO1/mxdirectx/mxdirect3d.h b/LEGO1/mxdirectx/mxdirect3d.h
index 2d89ad39..4de9f058 100644
--- a/LEGO1/mxdirectx/mxdirect3d.h
+++ b/LEGO1/mxdirectx/mxdirect3d.h
@@ -62,7 +62,7 @@ public:
DWORD GetZBufferBitDepth(MxAssignedDevice* p_assignedDevice);
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 IDirect3DDevice2* GetDirect3DDevice() { return this->m_pDirect3dDevice; }
diff --git a/LEGO1/omni/include/mxactionnotificationparam.h b/LEGO1/omni/include/mxactionnotificationparam.h
index 1bd5feb3..f53ac728 100644
--- a/LEGO1/omni/include/mxactionnotificationparam.h
+++ b/LEGO1/omni/include/mxactionnotificationparam.h
@@ -47,7 +47,7 @@ public:
virtual MxNotificationParam* Clone() override
{
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; }
@@ -96,7 +96,7 @@ public:
this->m_action,
this->m_realloc
);
- }; // vtable+0x04
+ } // vtable+0x04
};
// VTABLE: LEGO1 0x100dc208
diff --git a/LEGO1/omni/include/mxatomidcounter.h b/LEGO1/omni/include/mxatomidcounter.h
index 79a98f34..4d8bfe38 100644
--- a/LEGO1/omni/include/mxatomidcounter.h
+++ b/LEGO1/omni/include/mxatomidcounter.h
@@ -25,8 +25,8 @@ public:
void Inc();
void Dec();
- inline MxString* GetKey() { return &m_key; };
- inline MxU16 GetValue() { return m_value; };
+ inline MxString* GetKey() { return &m_key; }
+ inline MxU16 GetValue() { return m_value; }
private:
MxString m_key;
diff --git a/LEGO1/omni/include/mxaudiomanager.h b/LEGO1/omni/include/mxaudiomanager.h
index 94b5c4c9..d2b97d1a 100644
--- a/LEGO1/omni/include/mxaudiomanager.h
+++ b/LEGO1/omni/include/mxaudiomanager.h
@@ -15,7 +15,7 @@ public:
virtual void Destroy() override; // vtable+18
// 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
diff --git a/LEGO1/omni/include/mxaudiopresenter.h b/LEGO1/omni/include/mxaudiopresenter.h
index 82e4b48a..bf127d2b 100644
--- a/LEGO1/omni/include/mxaudiopresenter.h
+++ b/LEGO1/omni/include/mxaudiopresenter.h
@@ -24,10 +24,10 @@ public:
}
// FUNCTION: LEGO1 0x1000d260
- virtual MxS32 GetVolume() { return m_volume; }; // vtable+0x5c
+ virtual MxS32 GetVolume() { return m_volume; } // vtable+0x5c
// 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:
MxS32 m_volume;
diff --git a/LEGO1/omni/include/mxbitmap.h b/LEGO1/omni/include/mxbitmap.h
index 764a304a..7045c01e 100644
--- a/LEGO1/omni/include/mxbitmap.h
+++ b/LEGO1/omni/include/mxbitmap.h
@@ -44,7 +44,7 @@ public:
virtual MxLong Read(const char* p_filename); // vtable+24
// FUNCTION: LEGO1 0x1004e0d0
- virtual int VTable0x28(int) { return -1; }; // vtable+28
+ virtual int VTable0x28(int) { return -1; } // vtable+28
virtual void BitBlt(
MxBitmap* p_src,
diff --git a/LEGO1/omni/include/mxcompositepresenter.h b/LEGO1/omni/include/mxcompositepresenter.h
index 45ea1f4f..066a9ae2 100644
--- a/LEGO1/omni/include/mxcompositepresenter.h
+++ b/LEGO1/omni/include/mxcompositepresenter.h
@@ -44,7 +44,7 @@ public:
if (m_compositePresenter)
return m_compositePresenter->VTable0x64(p_undefined);
return TRUE;
- }; // vtable+0x64
+ } // vtable+0x64
protected:
MxCompositePresenterList m_list; // 0x40
diff --git a/LEGO1/omni/include/mxcore.h b/LEGO1/omni/include/mxcore.h
index 74ebbef0..dc167f2b 100644
--- a/LEGO1/omni/include/mxcore.h
+++ b/LEGO1/omni/include/mxcore.h
@@ -17,7 +17,7 @@ public:
virtual MxLong Notify(MxParam& p_param); // vtable+04
// FUNCTION: LEGO1 0x10001f70
- virtual MxResult Tickle() { return SUCCESS; }; // vtable+08
+ virtual MxResult Tickle() { return SUCCESS; } // vtable+08
// FUNCTION: LEGO1 0x100144c0
inline virtual const char* ClassName() const // vtable+0c
diff --git a/LEGO1/omni/include/mxdsmultiaction.h b/LEGO1/omni/include/mxdsmultiaction.h
index efc1a11d..22a04feb 100644
--- a/LEGO1/omni/include/mxdsmultiaction.h
+++ b/LEGO1/omni/include/mxdsmultiaction.h
@@ -36,7 +36,7 @@ public:
virtual MxBool HasId(MxU32 p_objectId) override; // vtable+34;
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
// MxDSMultiAction::`scalar deleting destructor'
diff --git a/LEGO1/omni/include/mxdsobject.h b/LEGO1/omni/include/mxdsobject.h
index 63f36975..9ede2f11 100644
--- a/LEGO1/omni/include/mxdsobject.h
+++ b/LEGO1/omni/include/mxdsobject.h
@@ -36,13 +36,13 @@ public:
void SetSourceName(const char* p_sourceName);
// 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
inline virtual MxBool IsA(const char* p_name) const override
{
return !strcmp(p_name, MxDSObject::ClassName()) || MxCore::IsA(p_name);
- }; // vtable+10;
+ } // vtable+10;
virtual undefined4 VTable0x14(); // vtable+14;
virtual MxU32 GetSizeOnDisk(); // vtable+18;
diff --git a/LEGO1/omni/include/mxentity.h b/LEGO1/omni/include/mxentity.h
index 60f24c56..df36ea37 100644
--- a/LEGO1/omni/include/mxentity.h
+++ b/LEGO1/omni/include/mxentity.h
@@ -36,7 +36,7 @@ public:
this->m_mxEntityId = p_id;
this->m_atom = p_atom;
return SUCCESS;
- }; // vtable+0x14
+ } // vtable+0x14
inline MxResult Create(MxDSAction& p_dsAction)
{
diff --git a/LEGO1/omni/include/mxlist.h b/LEGO1/omni/include/mxlist.h
index 99330975..b25c1ce2 100644
--- a/LEGO1/omni/include/mxlist.h
+++ b/LEGO1/omni/include/mxlist.h
@@ -53,8 +53,8 @@ public:
virtual ~MxList() override;
- void Append(T p_obj) { InsertEntry(p_obj, this->m_last, NULL); };
- void Prepend(T p_obj) { InsertEntry(p_obj, NULL, this->m_first); };
+ 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 DeleteAll(MxBool p_destroy = TRUE);
MxU32 GetCount() { return this->m_count; }
@@ -75,7 +75,7 @@ class MxPtrList : public MxList<T*> {
public:
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)
{
diff --git a/LEGO1/omni/include/mxmediapresenter.h b/LEGO1/omni/include/mxmediapresenter.h
index 96d4d0ad..f73cf2bf 100644
--- a/LEGO1/omni/include/mxmediapresenter.h
+++ b/LEGO1/omni/include/mxmediapresenter.h
@@ -13,7 +13,7 @@ public:
inline MxMediaPresenter() { Init(); }
// FUNCTION: LEGO1 0x1000c550
- virtual ~MxMediaPresenter() override { Destroy(TRUE); };
+ virtual ~MxMediaPresenter() override { Destroy(TRUE); }
virtual MxResult Tickle() override; // vtable+0x08
@@ -35,7 +35,7 @@ public:
virtual void DoneTickle() override; // vtable+0x2c
// 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 void EndAction() override; // vtable+0x40
diff --git a/LEGO1/omni/include/mxnotificationparam.h b/LEGO1/omni/include/mxnotificationparam.h
index ada00a35..9fe01c18 100644
--- a/LEGO1/omni/include/mxnotificationparam.h
+++ b/LEGO1/omni/include/mxnotificationparam.h
@@ -42,7 +42,7 @@ public:
}
// 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 MxCore* GetSender() const { return m_sender; }
diff --git a/LEGO1/omni/include/mxomni.h b/LEGO1/omni/include/mxomni.h
index 99962f82..a2092168 100644
--- a/LEGO1/omni/include/mxomni.h
+++ b/LEGO1/omni/include/mxomni.h
@@ -54,7 +54,7 @@ public:
virtual void StopTimer(); // vtable+3c
// 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 MxBool ActionSourceEquals(MxDSAction* p_action, const char* p_name);
diff --git a/LEGO1/omni/include/mxpresenter.h b/LEGO1/omni/include/mxpresenter.h
index 65beeb05..3d9dd355 100644
--- a/LEGO1/omni/include/mxpresenter.h
+++ b/LEGO1/omni/include/mxpresenter.h
@@ -60,17 +60,17 @@ public:
virtual void StartingTickle() { ProgressTickleState(e_streaming); } // vtable+0x1c
// FUNCTION: LEGO1 0x1000be80
- virtual void StreamingTickle() { ProgressTickleState(e_repeating); }; // vtable+0x20
+ virtual void StreamingTickle() { ProgressTickleState(e_repeating); } // vtable+0x20
// FUNCTION: LEGO1 0x1000bea0
- virtual void RepeatingTickle() { ProgressTickleState(e_unk5); }; // vtable+0x24
+ virtual void RepeatingTickle() { ProgressTickleState(e_unk5); } // vtable+0x24
// FUNCTION: LEGO1 0x1000bec0
- virtual void Unk5Tickle() { ProgressTickleState(e_done); }; // vtable+0x28
+ virtual void Unk5Tickle() { ProgressTickleState(e_done); } // vtable+0x28
protected:
// FUNCTION: LEGO1 0x1000bee0
- virtual void DoneTickle() { ProgressTickleState(e_idle); }; // vtable+0x2c
+ virtual void DoneTickle() { ProgressTickleState(e_idle); } // vtable+0x2c
virtual void ParseExtra(); // vtable+0x30
@@ -82,10 +82,10 @@ protected:
public:
// FUNCTION: LEGO1 0x1000bf70
- virtual MxResult AddToManager() { return SUCCESS; }; // vtable+0x34
+ virtual MxResult AddToManager() { return SUCCESS; } // vtable+0x34
// FUNCTION: LEGO1 0x1000bf80
- virtual void Destroy() { Init(); }; // vtable+0x38
+ virtual void Destroy() { Init(); } // vtable+0x38
virtual MxResult StartAction(MxStreamController*, MxDSAction*); // vtable+0x3c
virtual void EndAction(); // vtable+0x40
@@ -97,13 +97,13 @@ public:
virtual MxBool HasTickleStatePassed(TickleState p_tickleState)
{
return m_previousTickleStates & (1 << (MxU8) p_tickleState);
- }; // vtable+0x48
+ } // vtable+0x48
// FUNCTION: LEGO1 0x1000bfc0
- virtual MxResult PutData() { return SUCCESS; }; // vtable+0x4c
+ virtual MxResult PutData() { return SUCCESS; } // vtable+0x4c
// 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
diff --git a/LEGO1/omni/include/mxpresenterlist.h b/LEGO1/omni/include/mxpresenterlist.h
index 8b22a18b..dd119621 100644
--- a/LEGO1/omni/include/mxpresenterlist.h
+++ b/LEGO1/omni/include/mxpresenterlist.h
@@ -17,7 +17,7 @@ public:
virtual MxS8 Compare(MxPresenter* p_a, MxPresenter* p_b) override
{
return p_a == p_b ? 0 : p_a < p_b ? -1 : 1;
- }; // vtable+0x14
+ } // vtable+0x14
// SYNTHETIC: LEGO1 0x1001ceb0
// MxPresenterList::`scalar deleting destructor'
diff --git a/LEGO1/omni/include/mxrect32.h b/LEGO1/omni/include/mxrect32.h
index b52a0c31..20e1706e 100644
--- a/LEGO1/omni/include/mxrect32.h
+++ b/LEGO1/omni/include/mxrect32.h
@@ -114,8 +114,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; };
+ 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; }
MxS32 m_left; // 0x00
MxS32 m_top; // 0x04
diff --git a/LEGO1/omni/include/mxsoundpresenter.h b/LEGO1/omni/include/mxsoundpresenter.h
index 1949617f..4d1ab300 100644
--- a/LEGO1/omni/include/mxsoundpresenter.h
+++ b/LEGO1/omni/include/mxsoundpresenter.h
@@ -9,25 +9,25 @@
class MxSoundPresenter : public MxAudioPresenter {
public:
// FUNCTION: LEGO1 0x1000d430
- virtual ~MxSoundPresenter() override { Destroy(TRUE); };
+ virtual ~MxSoundPresenter() override { Destroy(TRUE); }
// FUNCTION: LEGO1 0x1000d4a0
inline virtual const char* ClassName() const // vtable+0x0c
{
// STRING: LEGO1 0x100f07a0
return "MxSoundPresenter";
- };
+ }
// FUNCTION: LEGO1 0x1000d4b0
inline virtual MxBool IsA(const char* p_name) const // vtable+0x10
{
return !strcmp(p_name, MxSoundPresenter::ClassName()) || MxAudioPresenter::IsA(p_name);
- };
+ }
virtual MxResult AddToManager() override; // vtable+0x34
// FUNCTION: LEGO1 0x1000d490
- virtual void Destroy() override { Destroy(FALSE); }; // vtable+0x38
+ virtual void Destroy() override { Destroy(FALSE); } // vtable+0x38
// SYNTHETIC: LEGO1 0x1000d5c0
// MxSoundPresenter::`scalar deleting destructor'
diff --git a/LEGO1/omni/include/mxstillpresenter.h b/LEGO1/omni/include/mxstillpresenter.h
index 09852493..a559b7e5 100644
--- a/LEGO1/omni/include/mxstillpresenter.h
+++ b/LEGO1/omni/include/mxstillpresenter.h
@@ -11,7 +11,7 @@ public:
MxStillPresenter() { m_bitmapInfo = NULL; }
// FUNCTION: LEGO1 0x10043550
- virtual ~MxStillPresenter() override { Destroy(TRUE); }; // vtable+0x00
+ virtual ~MxStillPresenter() override { Destroy(TRUE); } // vtable+0x00
// FUNCTION: LEGO1 0x100435c0
inline virtual const char* ClassName() const override // vtable+0x0c
@@ -32,7 +32,7 @@ public:
virtual void ParseExtra() override; // vtable+0x30
// 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 LoadHeader(MxStreamChunk* p_chunk) override; // vtable+0x5c
diff --git a/LEGO1/omni/include/mxstreamcontroller.h b/LEGO1/omni/include/mxstreamcontroller.h
index e6448947..a23c2537 100644
--- a/LEGO1/omni/include/mxstreamcontroller.h
+++ b/LEGO1/omni/include/mxstreamcontroller.h
@@ -53,11 +53,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; };
+ 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; }
protected:
MxCriticalSection m_criticalSection; // 0x08
diff --git a/LEGO1/omni/include/mxvariable.h b/LEGO1/omni/include/mxvariable.h
index e09d449c..9b0a3816 100644
--- a/LEGO1/omni/include/mxvariable.h
+++ b/LEGO1/omni/include/mxvariable.h
@@ -22,13 +22,13 @@ public:
}
// FUNCTION: LEGO1 0x1003bea0
- virtual MxString* GetValue() { return &m_value; };
+ virtual MxString* GetValue() { return &m_value; }
// 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
- virtual void Destroy() { delete this; };
+ virtual void Destroy() { delete this; }
inline const MxString* GetKey() const { return &m_key; }
diff --git a/LEGO1/omni/include/mxvideopresenter.h b/LEGO1/omni/include/mxvideopresenter.h
index b6483af9..d6ed46fa 100644
--- a/LEGO1/omni/include/mxvideopresenter.h
+++ b/LEGO1/omni/include/mxvideopresenter.h
@@ -13,7 +13,7 @@ public:
MxVideoPresenter() { Init(); }
// FUNCTION: LEGO1 0x1000c740
- virtual ~MxVideoPresenter() override { Destroy(TRUE); }; // vtable+0x00
+ virtual ~MxVideoPresenter() override { Destroy(TRUE); } // vtable+0x00
// FUNCTION: LEGO1 0x1000c820
inline virtual const char* ClassName() const override // vtable+0x0c
@@ -36,7 +36,7 @@ public:
virtual MxResult AddToManager() override; // vtable+0x34
// 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 MxResult PutData() override; // vtable+0x4c
@@ -61,16 +61,16 @@ public:
virtual undefined VTable0x74(); // vtable+0x74
// FUNCTION: LEGO1 0x1000c7b0
- virtual LPDIRECTDRAWSURFACE VTable0x78() { return m_unk0x58; }; // vtable+0x78
+ virtual LPDIRECTDRAWSURFACE VTable0x78() { return m_unk0x58; } // vtable+0x78
// 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
- 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
- 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
// SIZE 0x0c
diff --git a/LEGO1/omni/include/mxwavepresenter.h b/LEGO1/omni/include/mxwavepresenter.h
index 289fa879..8976b458 100644
--- a/LEGO1/omni/include/mxwavepresenter.h
+++ b/LEGO1/omni/include/mxwavepresenter.h
@@ -13,7 +13,7 @@ public:
MxWavePresenter() { Init(); }
// FUNCTION: LEGO1 0x1000d640
- virtual ~MxWavePresenter() override { Destroy(TRUE); }; // vtable+0x00
+ virtual ~MxWavePresenter() override { Destroy(TRUE); } // vtable+0x00
// FUNCTION: LEGO1 0x1000d6c0
inline virtual const char* ClassName() const override // vtable+0x0c
@@ -36,7 +36,7 @@ public:
virtual MxResult AddToManager() override; // vtable+0x34
// 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 MxResult PutData() override; // vtable+0x4c
@@ -47,7 +47,7 @@ public:
virtual void Resume(); // vtable+0x68
// FUNCTION: LEGO1 0x1000d6b0
- virtual MxBool IsPaused() { return m_paused; }; // vtable+0x6c
+ virtual MxBool IsPaused() { return m_paused; } // vtable+0x6c
// SIZE 0x18
struct WaveFormat {
diff --git a/LEGO1/realtime/matrix.h b/LEGO1/realtime/matrix.h
index ea217c0c..edca5395 100644
--- a/LEGO1/realtime/matrix.h
+++ b/LEGO1/realtime/matrix.h
@@ -25,28 +25,28 @@ public:
virtual void Equals(const Matrix4& p_matrix)
{
memcpy(m_data, p_matrix.m_data, sizeof(float) * 4 * 4);
- }; // vtable+0x00
+ } // vtable+0x00
// FUNCTION: LEGO1 0x10002360
virtual void SetData(float (*p_data)[4]) { m_data = p_data; } // vtable+0x0c
// 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
- virtual float (*GetData())[4] { return m_data; }; // vtable+0x14
+ virtual float (*GetData())[4] { return m_data; } // vtable+0x14
// 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
virtual float* Element(int p_row, int p_col) { return &m_data[p_row][p_col]; } // vtable+0x1c
// 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
- 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
virtual void SetIdentity()
@@ -98,7 +98,7 @@ public:
cur++;
}
}
- }; // vtable+0x3c
+ } // vtable+0x3c
// 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
diff --git a/LEGO1/tgl/d3drm/impl.h b/LEGO1/tgl/d3drm/impl.h
index 614b5f60..002ee7e9 100644
--- a/LEGO1/tgl/d3drm/impl.h
+++ b/LEGO1/tgl/d3drm/impl.h
@@ -40,7 +40,7 @@ class UnkImpl;
class RendererImpl : public Renderer {
public:
RendererImpl() : m_data(0) {}
- ~RendererImpl() { Destroy(); };
+ ~RendererImpl() { Destroy(); }
virtual void* ImplementationDataPtr() override;