From 82697d71482185a98d53749f48c21c1a7f20bec5 Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Thu, 9 Nov 2023 10:52:58 -0500 Subject: [PATCH] Add missing override keywords --- LEGO1/mxdsactionlist.h | 2 +- LEGO1/mxhashtable.h | 5 ++--- LEGO1/mxlist.h | 2 +- LEGO1/mxpresenterlist.h | 2 +- LEGO1/mxvariabletable.h | 4 ++-- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/LEGO1/mxdsactionlist.h b/LEGO1/mxdsactionlist.h index 3dc9798a..d3bafbbb 100644 --- a/LEGO1/mxdsactionlist.h +++ b/LEGO1/mxdsactionlist.h @@ -12,7 +12,7 @@ class MxDSActionList : public MxList { public: MxDSActionList() { this->m_unk18 = 0; } - virtual MxS8 Compare(MxDSAction*, MxDSAction*); // +0x14 + virtual MxS8 Compare(MxDSAction*, MxDSAction*) override; // +0x14 static void Destroy(MxDSAction* p_action); diff --git a/LEGO1/mxhashtable.h b/LEGO1/mxhashtable.h index f9a8df73..54ca16bd 100644 --- a/LEGO1/mxhashtable.h +++ b/LEGO1/mxhashtable.h @@ -63,13 +63,12 @@ class MxHashTable : protected HashTableParent { m_resizeOption = HASH_TABLE_OPT_NO_EXPAND; } - virtual ~MxHashTable(); + virtual ~MxHashTable() override; void Resize(); void Add(T*); - virtual MxS8 Compare(T*, T*) = 0; - + virtual MxS8 Compare(T*, T*) override = 0; virtual MxU32 Hash(T*) = 0; // FIXME: use of friend here? diff --git a/LEGO1/mxlist.h b/LEGO1/mxlist.h index 1d8e26c3..11f0e8ba 100644 --- a/LEGO1/mxlist.h +++ b/LEGO1/mxlist.h @@ -70,7 +70,7 @@ class MxList : protected MxListParent { m_first = NULL; } - virtual ~MxList(); + virtual ~MxList() override; void Append(T p_obj) { _InsertEntry(p_obj, this->m_last, NULL); }; void DeleteAll(); diff --git a/LEGO1/mxpresenterlist.h b/LEGO1/mxpresenterlist.h index b1a780bc..350d6c17 100644 --- a/LEGO1/mxpresenterlist.h +++ b/LEGO1/mxpresenterlist.h @@ -17,7 +17,7 @@ class MxPresenterListParent : public MxList { // SIZE 0x18 class MxPresenterList : public MxPresenterListParent { public: - virtual MxS8 Compare(MxPresenter*, MxPresenter*); // +0x14 + virtual MxS8 Compare(MxPresenter*, MxPresenter*) override; // +0x14 }; typedef MxListCursorChildChild MxPresenterListCursor; diff --git a/LEGO1/mxvariabletable.h b/LEGO1/mxvariabletable.h index 8bffab81..df34eb15 100644 --- a/LEGO1/mxvariabletable.h +++ b/LEGO1/mxvariabletable.h @@ -17,8 +17,8 @@ class MxVariableTable : public MxHashTable { // OFFSET: LEGO1 0x100afdb0 static void Destroy(MxVariable* p_obj) { p_obj->Destroy(); } - virtual MxS8 Compare(MxVariable*, MxVariable*); // +0x14 - virtual MxU32 Hash(MxVariable*); // +0x18 + virtual MxS8 Compare(MxVariable*, MxVariable*) override; // +0x14 + virtual MxU32 Hash(MxVariable*) override; // +0x18 }; // OFFSET: LEGO1 0x100b0bd0 TEMPLATE