Add static HandlerClassName function (#973)

* Add static HandlerClassName function * Use method in PresenterNameDispatch
isledecomp · May 30, 2024 · 3bb574f · 3bb574f
1 parent fae4f5f
commit 3bb574f
Show file tree

Hide file tree

Showing 39 changed files with 362 additions and 83 deletions.
diff --git a/LEGO1/lego/legoomni/include/jetskirace.h b/LEGO1/lego/legoomni/include/jetskirace.h
@@ -7,13 +7,20 @@
 // SIZE 0x144
 class JetskiRace : public LegoRace {
 public:
-	// FUNCTION: LEGO1 0x1000daf0
-	inline const char* ClassName() const override // vtable+0x0c
+	// FUNCTION: BETA10 0x100a8840
+	static const char* HandlerClassName()
 	{
 		// STRING: LEGO1 0x100f0530
 		return "JetskiRace";
 	}
 
+	// FUNCTION: LEGO1 0x1000daf0
+	// FUNCTION: BETA10 0x100a8810
+	inline const char* ClassName() const override // vtable+0x0c
+	{
+		return HandlerClassName();
+	}
+
 	// FUNCTION: LEGO1 0x1000db00
 	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{

diff --git a/LEGO1/lego/legoomni/include/lego3dwavepresenter.h b/LEGO1/lego/legoomni/include/lego3dwavepresenter.h
@@ -9,13 +9,20 @@
 // SIZE 0xa0
 class Lego3DWavePresenter : public MxWavePresenter {
 public:
-	// FUNCTION: LEGO1 0x1000d890
-	inline const char* ClassName() const override // vtable+0x0c
+	// FUNCTION: BETA10 0x100a8670
+	static const char* HandlerClassName()
 	{
 		// STRING: LEGO1 0x100f058c
 		return "Lego3DWavePresenter";
 	}
 
+	// FUNCTION: LEGO1 0x1000d890
+	// FUNCTION: BETA10 0x100a8640
+	inline const char* ClassName() const override // vtable+0x0c
+	{
+		return HandlerClassName();
+	}
+
 	// FUNCTION: LEGO1 0x1000d8a0
 	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{

diff --git a/LEGO1/lego/legoomni/include/legoactioncontrolpresenter.h b/LEGO1/lego/legoomni/include/legoactioncontrolpresenter.h
@@ -13,13 +13,20 @@ class LegoActionControlPresenter : public MxMediaPresenter {
 	LegoActionControlPresenter() { m_unk0x50 = Extra::ActionType::e_none; }
 	~LegoActionControlPresenter() override { Destroy(TRUE); } // vtable+0x00
 
-	// FUNCTION: LEGO1 0x1000d0e0
-	inline const char* ClassName() const override // vtable+0x0c
+	// FUNCTION: BETA10 0x100a7840
+	static const char* HandlerClassName()
 	{
 		// STRING: LEGO1 0x100f05bc
 		return "LegoActionControlPresenter";
 	}
 
+	// FUNCTION: LEGO1 0x1000d0e0
+	// FUNCTION: BETA10 0x100a7810
+	inline const char* ClassName() const override // vtable+0x0c
+	{
+		return HandlerClassName();
+	}
+
 	// FUNCTION: LEGO1 0x1000d0f0
 	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{

diff --git a/LEGO1/lego/legoomni/include/legoactorpresenter.h b/LEGO1/lego/legoomni/include/legoactorpresenter.h
@@ -12,13 +12,20 @@ class LegoActorPresenter : public LegoEntityPresenter {
 	// FUNCTION: LEGO1 0x100679c0
 	~LegoActorPresenter() override {}
 
-	// FUNCTION: LEGO1 0x1000cb10
-	inline const char* ClassName() const override // vtable+0x0c
+	// FUNCTION: BETA10 0x100a6f10
+	static const char* HandlerClassName()
 	{
 		// STRING: LEGO1 0x100f06a4
 		return "LegoActorPresenter";
 	}
 
+	// FUNCTION: LEGO1 0x1000cb10
+	// FUNCTION: BETA10 0x100a6ee0
+	inline const char* ClassName() const override // vtable+0x0c
+	{
+		return HandlerClassName();
+	}
+
 	// FUNCTION: LEGO1 0x1000cb20
 	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{

diff --git a/LEGO1/lego/legoomni/include/legoanimmmpresenter.h b/LEGO1/lego/legoomni/include/legoanimmmpresenter.h
@@ -29,13 +29,20 @@ class LegoAnimMMPresenter : public MxCompositePresenter {
 
 	MxLong Notify(MxParam& p_param) override; // vtable+0x04
 
-	// FUNCTION: LEGO1 0x1004a950
-	inline const char* ClassName() const override // vtable+0x0c
+	// FUNCTION: BETA10 0x1004d840
+	static const char* HandlerClassName()
 	{
 		// STRING: LEGO1 0x100f046c
 		return "LegoAnimMMPresenter";
 	}
 
+	// FUNCTION: LEGO1 0x1004a950
+	// FUNCTION: BETA10 0x1004d810
+	inline const char* ClassName() const override // vtable+0x0c
+	{
+		return HandlerClassName();
+	}
+
 	// FUNCTION: LEGO1 0x1004a960
 	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{

diff --git a/LEGO1/lego/legoomni/include/legoanimpresenter.h b/LEGO1/lego/legoomni/include/legoanimpresenter.h
@@ -41,13 +41,20 @@ class LegoAnimPresenter : public MxVideoPresenter {
 	LegoAnimPresenter();
 	~LegoAnimPresenter() override;
 
-	// FUNCTION: LEGO1 0x10068530
-	inline const char* ClassName() const override // vtable+0x0c
+	// FUNCTION: BETA10 0x10055300
+	static const char* HandlerClassName()
 	{
 		// STRING: LEGO1 0x100f071c
 		return "LegoAnimPresenter";
 	}
 
+	// FUNCTION: LEGO1 0x10068530
+	// FUNCTION: BETA10 0x100552d0
+	inline const char* ClassName() const override // vtable+0x0c
+	{
+		return HandlerClassName();
+	}
+
 	// FUNCTION: LEGO1 0x10068540
 	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{

diff --git a/LEGO1/lego/legoomni/include/legocarbuildanimpresenter.h b/LEGO1/lego/legoomni/include/legocarbuildanimpresenter.h
@@ -11,13 +11,20 @@ class LegoCarBuildAnimPresenter : public LegoAnimPresenter {
 	LegoCarBuildAnimPresenter();
 	~LegoCarBuildAnimPresenter() override; // vtable+0x00
 
-	// FUNCTION: LEGO1 0x10078510
-	inline const char* ClassName() const override // vtable+0x0c
+	// FUNCTION: BETA10 0x10073290
+	static const char* HandlerClassName()
 	{
 		// STRING: LEGO1 0x100f05ec
 		return "LegoCarBuildAnimPresenter";
 	}
 
+	// FUNCTION: LEGO1 0x10078510
+	// FUNCTION: BETA10 0x10073260
+	inline const char* ClassName() const override // vtable+0x0c
+	{
+		return HandlerClassName();
+	}
+
 	// FUNCTION: LEGO1 0x10078520
 	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{

diff --git a/LEGO1/lego/legoomni/include/legocontrolmanager.h b/LEGO1/lego/legoomni/include/legocontrolmanager.h
@@ -46,13 +46,20 @@ class LegoControlManager : public MxCore {
 
 	MxResult Tickle() override; // vtable+0x08
 
-	// FUNCTION: LEGO1 0x10028cb0
-	inline const char* ClassName() const override // vtable+0x0c
+	// FUNCTION: BETA10 0x1008af70
+	static const char* HandlerClassName()
 	{
 		// STRING: LEGO1 0x100f31b8
 		return "LegoControlManager";
 	}
 
+	// FUNCTION: LEGO1 0x10028cb0
+	// FUNCTION: BETA10 0x1008af40
+	inline const char* ClassName() const override // vtable+0x0c
+	{
+		return HandlerClassName();
+	}
+
 	// FUNCTION: LEGO1 0x10028cc0
 	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{

diff --git a/LEGO1/lego/legoomni/include/legoentitypresenter.h b/LEGO1/lego/legoomni/include/legoentitypresenter.h
@@ -13,13 +13,20 @@ class LegoEntityPresenter : public MxCompositePresenter {
 	LegoEntityPresenter();
 	~LegoEntityPresenter() override; // vtable+0x00
 
-	// FUNCTION: LEGO1 0x100534b0
-	inline const char* ClassName() const override // vtable+0x0c
+	// FUNCTION: BETA10 0x10080780
+	static const char* HandlerClassName()
 	{
 		// STRING: LEGO1 0x100f06b8
 		return "LegoEntityPresenter";
 	}
 
+	// FUNCTION: LEGO1 0x100534b0
+	// FUNCTION: BETA10 0x10080750
+	inline const char* ClassName() const override // vtable+0x0c
+	{
+		return HandlerClassName();
+	}
+
 	// FUNCTION: LEGO1 0x100534c0
 	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{

diff --git a/LEGO1/lego/legoomni/include/legoflctexturepresenter.h b/LEGO1/lego/legoomni/include/legoflctexturepresenter.h
@@ -10,13 +10,20 @@ class LegoFlcTexturePresenter : public MxFlcPresenter {
 public:
 	LegoFlcTexturePresenter();
 
-	// FUNCTION: LEGO1 0x1005def0
-	inline const char* ClassName() const override // vtable+0x0c
+	// FUNCTION: BETA10 0x100837e0
+	static const char* HandlerClassName()
 	{
 		// STRING: LEGO1 0x100f0634
 		return "LegoFlcTexturePresenter";
 	}
 
+	// FUNCTION: LEGO1 0x1005def0
+	// FUNCTION: BETA10 0x100837b0
+	inline const char* ClassName() const override // vtable+0x0c
+	{
+		return HandlerClassName();
+	}
+
 	void StartingTickle() override;                  // vtable+0x1c
 	void LoadFrame(MxStreamChunk* p_chunk) override; // vtable+0x68
 	void PutFrame() override;                        // vtable+0x6c

diff --git a/LEGO1/lego/legoomni/include/legohideanimpresenter.h b/LEGO1/lego/legoomni/include/legohideanimpresenter.h
@@ -25,13 +25,20 @@ class LegoHideAnimPresenter : public LegoLoopingAnimPresenter {
 	LegoHideAnimPresenter();
 	~LegoHideAnimPresenter() override;
 
-	// FUNCTION: LEGO1 0x1006d880
-	inline const char* ClassName() const override // vtable+0x0c
+	// FUNCTION: BETA10 0x1005d4a0
+	static const char* HandlerClassName()
 	{
 		// STRING: LEGO1 0x100f06cc
 		return "LegoHideAnimPresenter";
 	}
 
+	// FUNCTION: LEGO1 0x1006d880
+	// FUNCTION: BETA10 0x1005d470
+	inline const char* ClassName() const override // vtable+0x0c
+	{
+		return HandlerClassName();
+	}
+
 	// FUNCTION: LEGO1 0x1006d890
 	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{

diff --git a/LEGO1/lego/legoomni/include/legoloadcachesoundpresenter.h b/LEGO1/lego/legoomni/include/legoloadcachesoundpresenter.h
@@ -13,13 +13,20 @@ class LegoLoadCacheSoundPresenter : public MxWavePresenter {
 	LegoLoadCacheSoundPresenter();
 	~LegoLoadCacheSoundPresenter() override;
 
-	// FUNCTION: LEGO1 0x10018450
-	inline const char* ClassName() const override // vtable+0x0c
+	// FUNCTION: BETA10 0x1008cf90
+	static const char* HandlerClassName()
 	{
 		// STRING: LEGO1 0x100f05a0
 		return "LegoLoadCacheSoundPresenter";
 	}
 
+	// FUNCTION: LEGO1 0x10018450
+	// FUNCTION: BETA10 0x1008cf60
+	inline const char* ClassName() const override // vtable+0x0c
+	{
+		return HandlerClassName();
+	}
+
 	void ReadyTickle() override;     // vtable+0x18
 	void StreamingTickle() override; // vtable+0x20
 	void DoneTickle() override;      // vtable+0x2c

diff --git a/LEGO1/lego/legoomni/include/legolocomotionanimpresenter.h b/LEGO1/lego/legoomni/include/legolocomotionanimpresenter.h
@@ -11,13 +11,20 @@ class LegoLocomotionAnimPresenter : public LegoLoopingAnimPresenter {
 	LegoLocomotionAnimPresenter();
 	~LegoLocomotionAnimPresenter() override;
 
-	// FUNCTION: LEGO1 0x1006ce50
-	inline const char* ClassName() const override // vtable+0x0c
+	// FUNCTION: BETA10 0x1005c4e0
+	static const char* HandlerClassName()
 	{
 		// STRING: LEGO1 0x100f06e4
 		return "LegoLocomotionAnimPresenter";
 	}
 
+	// FUNCTION: LEGO1 0x1006ce50
+	// FUNCTION: BETA10 0x1005c4b0
+	inline const char* ClassName() const override // vtable+0x0c
+	{
+		return HandlerClassName();
+	}
+
 	// FUNCTION: LEGO1 0x1006ce60
 	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{

diff --git a/LEGO1/lego/legoomni/include/legoloopinganimpresenter.h b/LEGO1/lego/legoomni/include/legoloopinganimpresenter.h
@@ -7,13 +7,20 @@
 // SIZE 0xc0
 class LegoLoopingAnimPresenter : public LegoAnimPresenter {
 public:
-	// FUNCTION: LEGO1 0x1000c9a0
-	inline const char* ClassName() const override // vtable+0x0c
+	// FUNCTION: BETA10 0x1005c6f0
+	static const char* HandlerClassName()
 	{
 		// STRING: LEGO1 0x100f0700
 		return "LegoLoopingAnimPresenter";
 	}
 
+	// FUNCTION: LEGO1 0x1000c9a0
+	// FUNCTION: BETA10 0x1005c6c0
+	inline const char* ClassName() const override // vtable+0x0c
+	{
+		return HandlerClassName();
+	}
+
 	// FUNCTION: LEGO1 0x1000c9b0
 	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{

diff --git a/LEGO1/lego/legoomni/include/legomodelpresenter.h b/LEGO1/lego/legoomni/include/legomodelpresenter.h
@@ -19,13 +19,20 @@ class LegoModelPresenter : public MxVideoPresenter {
 
 	static void configureLegoModelPresenter(MxS32 p_modelPresenterConfig);
 
-	// FUNCTION: LEGO1 0x1000ccb0
-	inline const char* ClassName() const override // vtable+0x0c
+	// FUNCTION: BETA10 0x100a7180
+	static const char* HandlerClassName()
 	{
 		// STRING: LEGO1 0x100f067c
 		return "LegoModelPresenter";
 	}
 
+	// FUNCTION: LEGO1 0x1000ccb0
+	// FUNCTION: BETA10 0x100a7150
+	inline const char* ClassName() const override // vtable+0x0c
+	{
+		return HandlerClassName();
+	}
+
 	// FUNCTION: LEGO1 0x1000ccc0
 	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{

diff --git a/LEGO1/lego/legoomni/include/legopalettepresenter.h b/LEGO1/lego/legoomni/include/legopalettepresenter.h
@@ -13,13 +13,20 @@ class LegoPalettePresenter : public MxVideoPresenter {
 	LegoPalettePresenter();
 	~LegoPalettePresenter() override; // vtable+0x00
 
-	// FUNCTION: LEGO1 0x10079f30
-	inline const char* ClassName() const override // vtable+0x0c
+	// FUNCTION: BETA10 0x100ab250
+	static const char* HandlerClassName()
 	{
 		// STRING: LEGO1 0x100f061c
 		return "LegoPalettePresenter";
 	}
 
+	// FUNCTION: LEGO1 0x10079f30
+	// FUNCTION: BETA10 0x100ab220
+	inline const char* ClassName() const override // vtable+0x0c
+	{
+		return HandlerClassName();
+	}
+
 	// FUNCTION: LEGO1 0x10079f40
 	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{

diff --git a/LEGO1/lego/legoomni/include/legopartpresenter.h b/LEGO1/lego/legoomni/include/legopartpresenter.h
@@ -13,13 +13,20 @@ class LegoPartPresenter : public MxMediaPresenter {
 	// FUNCTION: LEGO1 0x10067300
 	~LegoPartPresenter() override { Destroy(TRUE); }
 
-	// FUNCTION: LEGO1 0x1000cf70
-	inline const char* ClassName() const override // vtable+0x0c
+	// FUNCTION: BETA10 0x100a75d0
+	static const char* HandlerClassName()
 	{
 		// STRING: LEGO1 0x100f05d8
 		return "LegoPartPresenter";
 	}
 
+	// FUNCTION: LEGO1 0x1000cf70
+	// FUNCTION: BETA10 0x100a75a0
+	inline const char* ClassName() const override // vtable+0x0c
+	{
+		return HandlerClassName();
+	}
+
 	// FUNCTION: LEGO1 0x1000cf80
 	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{